- Timestamp:
- 01/30/17 10:13:12 (7 years ago)
- Location:
- titan/libeplayer3
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/libeplayer3/container/container_ffmpeg.c
r39848 r39877 367 367 (flag == 1 && hasfillerThreadStarted[id] == 1 && avContextTab[0] != NULL && avContextTab[0]->pb != NULL && rwdiff > FILLBUFDIFF) ) 368 368 { 369 #ifdef MIPSEL 370 if( 0 == PlaybackDieNow(0)) 371 { 372 break; 373 } 374 #endif 369 // if( 0 == PlaybackDieNow(0)) 370 // { 371 // break; 372 // } 373 375 374 if(flag == 0 && ffmpeg_buf_stop == 1) 376 375 { … … 624 623 int32_t count = 2000; 625 624 626 #ifdef MIPSEL 627 while(sumlen < buf_size && (--count) > 0 && 0 == PlaybackDieNow(0)) 628 #else 625 // while(sumlen < buf_size && (--count) > 0 && 0 == PlaybackDieNow(0)) 629 626 while(sumlen < buf_size && (--count) > 0) 630 #endif631 627 { 632 628 len = ffmpeg_read_real(opaque, buf, buf_size - sumlen); … … 2324 2320 { 2325 2321 PlaybackHandler_t *p = (PlaybackHandler_t *)ctx; 2326 #ifdef MIPSEL 2327 return p->abortRequested || PlaybackDieNow(0); 2328 #else 2322 // return p->abortRequested || PlaybackDieNow(0); 2329 2323 // secound http stream not working with PlaybackDieNow(0) 2330 2324 return p->abortRequested; 2331 #endif2332 2325 } 2333 2326 -
titan/libeplayer3/output/linuxdvb_mipsel.c
r39876 r39877 50 50 /* ***************************** */ 51 51 52 #define LINUXDVB_DEBUG52 //#define LINUXDVB_DEBUG 53 53 #define LINUXDVB_SILENT 54 54 55 static unsigned short debug_level = 400;55 static unsigned short debug_level = 0; 56 56 57 57 static const char FILENAME[] = __FILE__; … … 212 212 getLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__); 213 213 214 215 linuxdvb_printf(250, "LinuxDvbClose 111111111111\n");216 217 214 if (video && videofd != -1) 218 215 { 219 linuxdvb_printf(250, "LinuxDvbClose 222222222222\n");220 221 216 close(videofd); 222 217 videofd = -1; … … 224 219 if (audio && audiofd != -1) 225 220 { 226 linuxdvb_printf(250, "LinuxDvbClose 333333333333\n");227 228 221 close(audiofd); 229 222 audiofd = -1; 230 223 } 231 linuxdvb_printf(250, "LinuxDvbClose 444444444444\n");232 224 233 225 releaseLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__); … … 253 245 254 246 // SULGE VU 4K dont like this 255 247 /* 256 248 if (0 != ioctl(videofd, VIDEO_STOP)) 257 249 { … … 260 252 ret = cERR_LINUXDVB_ERROR; 261 253 } 262 254 */ 263 255 264 256 if (writer == NULL) … … 307 299 308 300 // SULGE VU 4K dont like this 309 301 /* 310 302 if (0 != ioctl(audiofd, AUDIO_STOP)) 311 303 { … … 314 306 ret = cERR_LINUXDVB_ERROR; 315 307 } 308 */ 316 309 317 310 if (writer == NULL) … … 361 354 getLinuxDVBMutex(FILENAME, __FUNCTION__,__LINE__); 362 355 363 linuxdvb_printf(250, "LinuxDvbStop aaaaaaaaaaaaa\n");364 365 356 if (video && videofd != -1) 366 357 { 367 linuxdvb_printf(250, "LinuxDvbStop bbbbbbbbbbbbbbb\n");368 369 358 if (ioctl(videofd, VIDEO_CLEAR_BUFFER) == -1) 370 359 { … … 372 361 linuxdvb_err("VIDEO_CLEAR_BUFFER: %s\n", strerror(errno)); 373 362 } 374 linuxdvb_printf(250, "LinuxDvbStop bbbbbbbb11111111\n");375 363 376 364 if (ioctl(videofd, VIDEO_STOP) == -1) … … 381 369 } 382 370 383 linuxdvb_printf(250, "LinuxDvbStop bbbbbbbb22222222\n");384 385 371 ioctl(videofd, VIDEO_SLOWMOTION, 0); 386 372 ioctl(videofd, VIDEO_FAST_FORWARD, 0); … … 389 375 } 390 376 if (audio && audiofd != -1) { 391 linuxdvb_printf(250, "LinuxDvbStop ccccccc11111111\n");392 393 377 if (ioctl(audiofd, AUDIO_CLEAR_BUFFER) == -1) 394 378 { … … 396 380 linuxdvb_err("AUDIO_CLEAR_BUFFER: %s\n", strerror(errno)); 397 381 } 398 linuxdvb_printf(250, "LinuxDvbStop ccccccc2222222\n");399 382 400 383 /* set back to normal speed (end trickmodes) */ 401 if (ioctl(audiofd, AUDIO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1) 402 { 403 linuxdvb_err("ioctl failed with errno %d\n", errno); 404 linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno)); 405 } 406 linuxdvb_printf(250, "LinuxDvbStop ccccccc3333333\n"); 407 384 // if (ioctl(audiofd, AUDIO_SET_SPEED, DVB_SPEED_NORMAL_PLAY) == -1) 385 // { 386 // linuxdvb_err("ioctl failed with errno %d\n", errno); 387 // linuxdvb_err("AUDIO_SET_SPEED: %s\n", strerror(errno)); 388 // } 408 389 if (ioctl(audiofd, AUDIO_STOP) == -1) 409 390 { … … 412 393 ret = cERR_LINUXDVB_ERROR; 413 394 } 414 linuxdvb_printf(250, "LinuxDvbStop ccccccc444444444\n");415 416 395 ioctl(audiofd, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_DEMUX); 417 396 } -
titan/libeplayer3/output/linuxdvb_sh4.c
r39858 r39877 51 51 /* ***************************** */ 52 52 53 #define LINUXDVB_DEBUG53 //#define LINUXDVB_DEBUG 54 54 #define LINUXDVB_SILENT 55 55 56 static unsigned short debug_level = 200;56 static unsigned short debug_level = 0; 57 57 58 58 static const char FILENAME[] = __FILE__; -
titan/libeplayer3/output/writer/mipsel/writer.c
r39873 r39877 97 97 ssize_t ret; 98 98 int retval = 0; 99 #ifdef MIPSEL100 99 while(size > 0 && 0 == PlaybackDieNow(0)) 101 #else102 while(size > 0)103 #endif104 100 { 105 101 ret = write(fd, buf, size); … … 150 146 write_with_retry(fd, iov[i].iov_base, iov[i].iov_len); 151 147 len += iov[i].iov_len; 152 #ifdef MIPSEL153 148 if(PlaybackDieNow(0)) 154 149 { 155 150 return -1; 156 151 } 157 #endif158 152 } 159 153 return len; … … 181 175 { 182 176 int i; 183 printf("getDefaultVideoWriter in\n"); 184 185 for (i = 0; AvailableWriter[i] != NULL; i++) 186 { 187 printf("getDefaultVideoWriter=%s\n", AvailableWriter[i]->caps->textEncoding); 177 178 for (i = 0; AvailableWriter[i] != NULL; i++) 179 { 188 180 if (strcmp(AvailableWriter[i]->caps->textEncoding, "V_MPEG2") == 0) 189 181 { … … 201 193 { 202 194 int i; 203 printf("getDefaultAudioWriter in\n"); 204 205 for (i = 0; AvailableWriter[i] != NULL; i++) 206 { 207 printf("getDefaultAudioWriter=%s\n", AvailableWriter[i]->caps->textEncoding); 208 195 196 for (i = 0; AvailableWriter[i] != NULL; i++) 197 { 209 198 if (strcmp(AvailableWriter[i]->caps->textEncoding, "A_MP3") == 0) 210 199 { -
titan/libeplayer3/playback/playback.c
r39848 r39877 78 78 dieNow = 1; 79 79 } 80 printf("PlaybackDieNow=%d\n", dieNow);81 80 return dieNow; 82 81 }
Note: See TracChangeset
for help on using the changeset viewer.