mirror of
https://github.com/tuxbox-neutrino/libstb-hal.git
synced 2025-08-28 07:51:21 +02:00
fix indent
This commit is contained in:
@@ -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: {
|
||||||
|
Reference in New Issue
Block a user