fix indent

This commit is contained in:
martii
2012-08-13 18:42:15 +02:00
committed by Stefan Seyfried
parent d431e60284
commit e94b7daf85

View File

@@ -368,8 +368,8 @@ static void FFMPEGThread(Context_t *context) {
#define reverse_playback_3 #define reverse_playback_3
#ifdef reverse_playback_3 #ifdef reverse_playback_3
if (context->playback->BackWard && av_gettime() >= showtime) if (context->playback->BackWard && av_gettime() >= showtime)
{ {
audioMute = 1; audioMute = 1;
context->output->Command(context, OUTPUT_CLEAR, "v"); context->output->Command(context, OUTPUT_CLEAR, "v");
@@ -401,16 +401,16 @@ if (context->playback->BackWard && av_gettime() >= showtime)
lastPts = lastPts + (context->playback->Speed * 90000); lastPts = lastPts + (context->playback->Speed * 90000);
showtime = av_gettime() + 300000; //jump back all 300ms showtime = av_gettime() + 300000; //jump back all 300ms
} }
if(!context->playback->BackWard && audioMute) if(!context->playback->BackWard && audioMute)
{ {
lastPts = -1; lastPts = -1;
bofcount = 0; bofcount = 0;
showtime = 0; showtime = 0;
audioMute = 0; audioMute = 0;
context->output->Command(context, OUTPUT_AUDIOMUTE, "0"); context->output->Command(context, OUTPUT_AUDIOMUTE, "0");
} }
#endif #endif
#ifdef reverse_playback_2 #ifdef reverse_playback_2
@@ -600,6 +600,7 @@ if(!context->playback->BackWard && audioMute)
ffmpeg_err("(raw pcm) writing data to audio device failed\n"); ffmpeg_err("(raw pcm) writing data to audio device failed\n");
} }
} }
else if (audioTrack->inject_as_pcm == 1) else if (audioTrack->inject_as_pcm == 1)
{ {
int bytesDone = 0; int bytesDone = 0;
@@ -1673,15 +1674,26 @@ static int container_ffmpeg_seek(Context_t *context, float sec) {
{ {
sec *= 180000.0; sec *= 180000.0;
} }
#ifdef MARTII
if (absolute)
pos = sec;
else
pos += sec;
#else
#if !defined(VDR1722) #if !defined(VDR1722)
pos += sec; pos += sec;
#else #else
pos = sec; pos = sec;
#endif
#endif #endif
if (pos < 0) if (pos < 0)
{ {
#ifdef MARTII
pos = 0;
#else
ffmpeg_err("end of file reached\n"); ffmpeg_err("end of file reached\n");
return cERR_CONTAINER_FFMPEG_END_OF_FILE; return cERR_CONTAINER_FFMPEG_END_OF_FILE;
#endif
} }
ffmpeg_printf(10, "1. seeking to position %lld bytes ->sec %f\n", pos, sec); ffmpeg_printf(10, "1. seeking to position %lld bytes ->sec %f\n", pos, sec);
@@ -1695,8 +1707,13 @@ static int container_ffmpeg_seek(Context_t *context, float sec) {
} else } else
{ {
#ifdef MARTII
if (!absolute)
sec += ((float) current->pts / 90000.0f);
#else
#if !defined(VDR1722) #if !defined(VDR1722)
sec += ((float) current->pts / 90000.0f); sec += ((float) current->pts / 90000.0f);
#endif
#endif #endif
ffmpeg_printf(10, "2. seeking to position %f sec ->time base %f %d\n", sec, av_q2d(((AVStream*) current->stream)->time_base), AV_TIME_BASE); ffmpeg_printf(10, "2. seeking to position %f sec ->time base %f %d\n", sec, av_q2d(((AVStream*) current->stream)->time_base), AV_TIME_BASE);
@@ -1870,7 +1887,16 @@ static int Command(void *_context, ContainerCmd_t command, void * argument)
break; break;
} }
case CONTAINER_SEEK: { case CONTAINER_SEEK: {
#ifdef MARTII
ret = container_ffmpeg_seek(context, (float)*((float*)argument), 0);
#else
ret = container_ffmpeg_seek(context, (float)*((float*)argument)); ret = container_ffmpeg_seek(context, (float)*((float*)argument));
#endif
break;
}
#ifdef MARTII
case CONTAINER_SEEK_ABS: {
ret = container_ffmpeg_seek(context, (float)*((float*)argument), -1);
break; break;
} }
case CONTAINER_LENGTH: { case CONTAINER_LENGTH: {