Changeset 34869
- Timestamp:
- 07/18/15 17:59:14 (9 years ago)
- Location:
- titan/titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/pip.h
r34750 r34869 451 451 int hdmi = 0; 452 452 char* tmpstr = NULL; 453 struct dvbdev *videonode = NULL;454 struct dvbdev *audionode = NULL;455 453 struct channel* chnodeP = node->channel; 456 454 struct channel* chnodeT = status.aktservice->channel; … … 486 484 pipstop(node, 0); 487 485 servicestop(status.aktservice, 1, 1); 488 audionode = audioopen(0); 489 if(audionode != NULL) 490 { 491 audioselectsource(audionode, AUDIO_SOURCE_HDMI); 492 audioplay(audionode); 493 } 494 videonode = videoopen(0, 0); 495 if(videonode != NULL) 496 { 497 videoselectsource(videonode, VIDEO_SOURCE_HDMI); 498 videosetstreamtype(videonode, 0); 499 videoplay(videonode); 500 } 501 status.aktservice->videodev = videonode; 502 status.aktservice->audiodev = audionode; 503 status.aktservice->type = HDMIIN; 504 status.aktservice->channel = NULL; 486 servicefullHDMIin_start(); 505 487 pipstart(chnodeT, NULL, 0); 506 488 free(node->channellist); -
titan/titan/record.h
r34847 r34869 317 317 } 318 318 encoderclose(node->encoderdev, -1); 319 printf("---- encoder closed\n"); 319 320 } 320 321 #endif … … 940 941 tmpstr = ostrcat(tmpstr, buf1, 1, 1); 941 942 tmpstr = ostrcat(tmpstr, ")", 1, 0); 942 tmpstr = ostrcat(tmpstr, ".ts", 1, 0); 943 if(ostrcmp(channelname, "HDMIIN") == 0) 944 tmpstr = ostrcat(tmpstr, ".mpeg", 1, 0); 945 else 946 tmpstr = ostrcat(tmpstr, ".ts", 1, 0); 943 947 944 948 return tmpstr; … … 971 975 } 972 976 973 if(filefd < 0) 977 //hdmi record.. serviceid=65535 978 if(filefd < 0 && chnode->serviceid != 65535) 974 979 { 975 980 tpnode = chnode->transponder; … … 980 985 } 981 986 } 987 982 988 983 989 switch(type) … … 991 997 fd = recordfd; 992 998 break; 993 999 case RECSTREAMENC: 994 1000 servicetype = RECORDSTREAM; 995 1001 fd = recordfd; … … 1110 1116 if(rectimernode != NULL) servicenode->rectimestamp = ostrcat(rectimernode->timestamp, NULL, 0, 0); 1111 1117 1112 if(filefd < 0 )1118 if(filefd < 0 && chnode->serviceid != 65535) 1113 1119 { 1114 1120 //got frontend dev … … 1322 1328 } 1323 1329 } 1324 1330 #ifdef MIPSEL 1331 else if(chnode->serviceid == 65535) 1332 { 1333 ret = encoderset(-1, 1, 1024*1024*8, 1280, 720, 25000, 0, 0); 1334 ret = 0; 1335 encnode = encoderopen(0); 1336 servicenode->encoderdev = encnode; 1337 1338 videonode = videoopen(0, encnode->decoder); 1339 servicenode->videodev = videonode; 1340 videoselectsource(servicenode->videodev, VIDEO_SOURCE_HDMI); 1341 videoplay(servicenode->videodev); 1342 1343 audionode = audioopen(encnode->decoder); 1344 servicenode->audiodev = audionode; 1345 audioselectsource(servicenode->audiodev, AUDIO_SOURCE_HDMI); 1346 audioplay(servicenode->audiodev); 1347 1348 encnode->fd = encoderopendirect(encnode->dev); 1349 servicenode->recdmxstart = 1; 1350 servicenode->recsrcfd = encnode->fd; 1351 } 1352 #endif 1353 1325 1354 if(rectimernode != NULL) 1326 1355 rectimernode->servicenode = servicenode; … … 1360 1389 if(VFD_Recordthread == NULL && getconfigint("vfdisplayrecord", NULL) != 0) 1361 1390 VFD_Recordthread = addtimer(&vfdrecordthread, START, 10000, 1, NULL, NULL, NULL); 1391 #ifdef MIPSEL 1392 if(chnode->serviceid == 65535) 1393 servicenode->recsrcfd = encnode->fd; 1394 #endif 1362 1395 } 1363 1396 … … 1583 1616 servicenode = servicenode->next; 1584 1617 } 1585 1586 addmenulist(&mlist, _("add recording (stop after current event)"), NULL, NULL, 0, 0); 1618 //65535 gleich HDMIIN 1619 if(status.aktservice->channel->serviceid != 65535) 1620 addmenulist(&mlist, _("add recording (stop after current event)"), NULL, NULL, 0, 0); 1587 1621 addmenulist(&mlist, _("add recording (indefinitely)"), NULL, NULL, 0, 0); 1588 1622 addmenulist(&mlist, _("add recording (enter duration)"), NULL, NULL, 0, 0);
Note: See TracChangeset
for help on using the changeset viewer.