Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-20 14:47:49 +02:00
Code Issues Releases Wiki Activity

Fix compilation of EXPERIMENTAL_OD_FFMPEG

Browse Source
This commit is contained in:
Paul Licameli 2017-03-01 00:31:39 -05:00
parent 463e7d971d
commit e7c0862546
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ondemand/ODDecodeFFmpegTask.cpp
View File

@ -265,7 +265,7 @@ mStreamIndex(streamIndex)
sc->m_stream->start_time > 0) { sc->m_stream->start_time > 0) {
stream_delay = sc->m_stream->start_time; stream_delay = sc->m_stream->start_time;
} }
mCurrentPos = double(stream_delay) / AV_TIME_BASE; mCurrentPos = sampleCount{ double(stream_delay) / AV_TIME_BASE };
//TODO: add a ref counter to scs? This will be necessary if we want to allow copy and paste of not-yet decoded //TODO: add a ref counter to scs? This will be necessary if we want to allow copy and paste of not-yet decoded
//ODDecodeBlockFiles that point to FFmpeg files. //ODDecodeBlockFiles that point to FFmpeg files.
@ -340,7 +340,7 @@ int ODFFmpegDecoder::Decode(SampleBuffer & data, sampleFormat & format, sampleCo
//printf("attempting seek to %llu, attempts %d\n", targetts, numAttempts); //printf("attempting seek to %llu, attempts %d\n", targetts, numAttempts);
if(av_seek_frame(mFormatContext,stindex,targetts,0) >= 0){ if(av_seek_frame(mFormatContext,stindex,targetts,0) >= 0){
//find out the dts we've seekd to. //find out the dts we've seekd to.
sampleCount actualDecodeStart = 0.5 + st->codec->sample_rate * st->cur_dts * ((double)st->time_base.num/st->time_base.den); //this is mostly safe because den is usually 1 or low number but check for high values. sampleCount actualDecodeStart { 0.5 + st->codec->sample_rate * st->cur_dts * ((double)st->time_base.num/st->time_base.den) }; //this is mostly safe because den is usually 1 or low number but check for high values.
mCurrentPos = actualDecodeStart; mCurrentPos = actualDecodeStart;
seeking = true; seeking = true;
@ -375,8 +375,8 @@ int ODFFmpegDecoder::Decode(SampleBuffer & data, sampleFormat & format, sampleCo
// for some formats // for some formats
// The only other case for inserting silence is for initial offset and ImportFFmpeg.cpp does this for us // The only other case for inserting silence is for initial offset and ImportFFmpeg.cpp does this for us
if (seeking) { if (seeking) {
actualDecodeStart = 0.52 + (sc->m_stream->codec->sample_rate * sc->m_pkt->dts actualDecodeStart = sampleCount{ 0.52 + (sc->m_stream->codec->sample_rate * sc->m_pkt->dts
* ((double)sc->m_stream->time_base.num / sc->m_stream->time_base.den)); * ((double)sc->m_stream->time_base.num / sc->m_stream->time_base.den)) };
//this is mostly safe because den is usually 1 or low number but check for high values. //this is mostly safe because den is usually 1 or low number but check for high values.
//hack to get rounding to work to neareset frame size since dts isn't exact //hack to get rounding to work to neareset frame size since dts isn't exact
@ -548,7 +548,7 @@ int ODFFmpegDecoder::FillDataFromCache(samplePtr & data, sampleFormat outFormat,
case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32:
//printf("s32 in %lu out %lu cachelen %lu outLen %lu\n", inIndex, outIndex, mDecodeCache[i]->len, len); //printf("s32 in %lu out %lu cachelen %lu outLen %lu\n", inIndex, outIndex, mDecodeCache[i]->len, len);
((float *)outBuf)[outIndex] = (float) ((int32_t*)mDecodeCache[i]->samplePtr.get())[inIndex] * (1.0 / (1u << 31)); ((float *)outBuf)[outIndex] = (float) ((int32_t*)mDecodeCache[i]->samplePtr)[inIndex] * (1.0 / (1u << 31));
break; break;
case AV_SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLT: