Skip to content

Commit 925cedf

Browse files
madmartinmadmartin
committed
add support for LIBAVCODEC version 57 (ffmpeg-3.4)
Signed-off-by: Martin Dummer <[email protected]>
1 parent 12c68a9 commit 925cedf

File tree

3 files changed

+200
-14
lines changed

3 files changed

+200
-14
lines changed

‎audiotools.cpp

+72-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ int64_t audiobasepts=0;
5858
//int64_t audiopts=0;
5959
extern uint64_t audiopts;
6060
int64_t audiosamples=0;
61+
#if LIBAVCODEC_VERSION_MAJOR < 57
6162
uint8_t audio_in_buffer[8192];
63+
#else
64+
uint8_t audio_in_buffer[8192 + AV_INPUT_BUFFER_PADDING_SIZE];
65+
#endif
6266
int in_buf_count = 0;
6367
static bool av_codec_initialised = false;
6468

@@ -95,8 +99,12 @@ void initAVCodec()
9599
avcodec_register_all();
96100

97101
/* find the mpeg audio decoder */
102+
#if LIBAVCODEC_VERSION_MAJOR < 57
98103
codec = avcodec_find_decoder(CODEC_ID_MP3);
99-
104+
#else
105+
codec = avcodec_find_decoder(AV_CODEC_ID_MP3);
106+
#endif
107+
100108
if (!codec)
101109
{
102110
fprintf(stdout, "codec not found\n");
@@ -122,7 +130,7 @@ void initAVCodec()
122130
outbuf = (uint8_t *)malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
123131

124132
av_codec_initialised = true;
125-
133+
126134
}
127135

128136
void exitAVCodec()
@@ -182,14 +190,74 @@ int scan_audio_stream_0(unsigned char *mbuf, int count)
182190
#if (LIBAVCODEC_VERSION_MAJOR < 53)
183191
len = avcodec_decode_audio2(codecContext, (short *)outbuf, &out_size,
184192
inbuf_ptr, 576/*size*/);
185-
#else
193+
#elseif (LIBAVCODEC_VERSION_MAJOR < 57)
186194
AVPacket p;
187195
av_init_packet(&p);
188196
p.data = inbuf_ptr;
189197
p.size = 576;
190198
len = avcodec_decode_audio3(codecContext, (short *)outbuf,
191199
&out_size, &p);
200+
#else
201+
AVPacket p;
202+
av_init_packet(&p);
203+
p.data = inbuf_ptr;
204+
p.size = 576;
205+
int ret = avcodec_send_packet(codecContext, &p);
206+
if (ret != 0 && ret != AVERROR(EAGAIN))
207+
{
208+
size = 0;
209+
break;
210+
}
211+
len = ret == AVERROR(EAGAIN)? 0 : 576;
212+
213+
AVFrame *frame = av_frame_alloc();
214+
if (!frame)
215+
{
216+
size = 0;
217+
break;
218+
}
219+
220+
do
221+
{
222+
ret = avcodec_receive_frame(codecContext, frame);
223+
if (ret != 0 && ret != AVERROR (EAGAIN))
224+
{
225+
size = 0;
226+
av_frame_free(&frame);
227+
out_size = 0;
228+
break;
229+
}
230+
231+
int ch, plane_size;
232+
int planar = av_sample_fmt_is_planar(codecContext->sample_fmt);
233+
int data_size = av_samples_get_buffer_size(&plane_size, codecContext->channels,
234+
frame->nb_samples,
235+
codecContext->sample_fmt, 1);
236+
if (out_size < data_size) {
237+
av_log(codecContext, AV_LOG_ERROR, "output buffer size is too small for "
238+
"the current frame (%d < %d)\n", out_size, data_size);
239+
av_frame_free(&frame);
240+
size = 0;
241+
out_size = 0;
242+
break;
243+
}
244+
245+
memcpy(outbuf, frame->extended_data[0], plane_size);
246+
247+
if (planar && codecContext->channels > 1) {
248+
uint8_t *out = ((uint8_t *)outbuf) + plane_size;
249+
for (ch = 1; ch < codecContext->channels; ch++) {
250+
memcpy(out, frame->extended_data[ch], plane_size);
251+
out += plane_size;
252+
}
253+
}
254+
out_size = data_size;
255+
}
256+
while (ret == 0);
257+
258+
av_frame_free(&frame);
192259
#endif
260+
193261
if (len < 0)
194262
{
195263
//fprintf(stderr, "Error while decoding audio\n\n");
@@ -199,7 +267,7 @@ int scan_audio_stream_0(unsigned char *mbuf, int count)
199267
break;
200268
}
201269
// SDL_PauseAudio(0);
202-
if (out_size > 0)
270+
if (out_size > 0)
203271
{
204272
audiosamples += out_size/4;
205273
//fprintf(stdout,"decode audio out_size=%d\n",out_size);

‎ffmpeg_decoder.cpp

+125-10
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ FFMPegDecoder::FFMPegDecoder() :
126126
pFormatCtx = NULL;
127127
//i, videoStream;
128128
pCodecCtx = NULL;
129+
#if LIBAVCODEC_VERSION_MAJOR > 56
130+
pCodecPar = NULL;
131+
#endif
129132
pCodec = NULL;
130133
pFrame = NULL;
131134
__bufBytes = 0;
@@ -184,11 +187,16 @@ int FFMPegDecoder::openFile(cFileName *_cfn, cNoadIndexFile *_cIF)
184187

185188
// Retrieve stream information
186189
resetDecoder();
187-
int openCode2 = av_find_stream_info(pFormatCtx);
190+
#if LIBAVCODEC_VERSION_MAJOR <57
191+
int openCode2 = av_find_stream_info(pFormatCtx);
192+
#else
193+
int openCode2 = avformat_find_stream_info(pFormatCtx, NULL);
194+
#endif
188195
if(openCode2<0)
189196
return -1; // Couldn't find stream information
190197

191198
// Find the first video stream
199+
#if LIBAVCODEC_VERSION_MAJOR <57
192200
videoStream=-1;
193201
for(i=0; i < (int)pFormatCtx->nb_streams; i++)
194202
{
@@ -198,10 +206,17 @@ int FFMPegDecoder::openFile(cFileName *_cfn, cNoadIndexFile *_cIF)
198206
break;
199207
}
200208
}
201-
if(videoStream==-1)
202-
return -1; // Didn't find a video stream
209+
#else
210+
videoStream = av_find_best_stream(pFormatCtx, AVMEDIA_TYPE_VIDEO, -1, -1, &pCodec, 0);
211+
#endif
212+
if(videoStream < 0)
213+
{
214+
esyslog("can't find a video stream!");
215+
return -1;
216+
}
203217

204218
// Get a pointer to the codec context for the video stream
219+
#if LIBAVCODEC_VERSION_MAJOR <57
205220
pCodecCtx=pFormatCtx->streams[videoStream]->codec;
206221
pCodecCtx->flags|=CODEC_FLAG_EMU_EDGE;
207222

@@ -210,9 +225,18 @@ int FFMPegDecoder::openFile(cFileName *_cfn, cNoadIndexFile *_cIF)
210225
esyslog("can't detect codec for video!");
211226
return -1;
212227
}
228+
#else
229+
pCodecPar=pFormatCtx->streams[videoStream]->codecpar;
230+
if( pCodecPar->codec_id == AV_CODEC_ID_PROBE )
231+
{
232+
esyslog("can't detect codec for video!");
233+
return -1;
234+
}
235+
#endif
213236
//av_close_input_file(pFormatCtx);
214237

215238
// Find the decoder for the video stream
239+
#if LIBAVCODEC_VERSION_MAJOR < 57
216240
pCodec=avcodec_find_decoder(pCodecCtx->codec_id);
217241
if(pCodec==NULL)
218242
return -1; // Codec not found
@@ -221,23 +245,37 @@ int FFMPegDecoder::openFile(cFileName *_cfn, cNoadIndexFile *_cIF)
221245
// bitstreams where frame boundaries can fall in the middle of packets
222246
if(pCodec->capabilities & CODEC_CAP_TRUNCATED)
223247
pCodecCtx->flags|=CODEC_FLAG_TRUNCATED;
248+
#else
249+
pCodec=avcodec_find_decoder(pCodecPar->codec_id);
250+
if(pCodec==NULL)
251+
return -1; // Codec not found
252+
253+
// Create CodecContext from Codec
254+
pCodecCtx= avcodec_alloc_context3(pCodec);
255+
256+
// Inform the codec that we can handle truncated bitstreams -- i.e.,
257+
// bitstreams where frame boundaries can fall in the middle of packets
258+
if(pCodec->capabilities & AV_CODEC_CAP_TRUNCATED)
259+
pCodecCtx->flags|=AV_CODEC_FLAG_TRUNCATED;
260+
#endif
224261

225-
#if LIBAVCODEC_VERSION_MAJOR > 54
226262
// Open codec
263+
#if LIBAVCODEC_VERSION_MAJOR > 54
227264
if(avcodec_open2(pCodecCtx, pCodec,&avDictionary) < 0)
228265
#else
229-
// Open codec
230266
if(avcodec_open(pCodecCtx, pCodec)<0)
231267
#endif
232268
return -1; // Could not open codec
233269

234-
235-
236270
// Allocate video frame
237-
pFrame=avcodec_alloc_frame();
271+
#if LIBAVCODEC_VERSION_MAJOR < 57
272+
pFrame=avcodec_alloc_frame();
273+
#else
274+
pFrame=av_frame_alloc();
275+
#endif
238276
cont_reading = true;
239-
doSeekPos = false;
240-
dsyslog("init_ffmpeg done" );
277+
doSeekPos = false;
278+
dsyslog("init_ffmpeg done" );
241279
return false;
242280
}
243281

@@ -253,7 +291,11 @@ int FFMPegDecoder::decoder_exit()
253291
// close the file
254292
if( pFormatCtx )
255293
{
294+
#if LIBAVFORMAT_VERSION_MAJOR < 54
256295
av_close_input_file(pFormatCtx);
296+
#else
297+
avformat_close_input(&pFormatCtx);
298+
#endif
257299
pFormatCtx = NULL;
258300
}
259301
// Close the codec
@@ -285,7 +327,9 @@ bool FFMPegDecoder::GetVideoFrame(bool restart)
285327
static bool fFirstTime=true;
286328
int bytesDecoded;
287329
int frameFinished;
330+
int ret;
288331

332+
#if LIBAVCODEC_VERSION_MAJOR < 57
289333
if( restart )
290334
{
291335
bytesRemaining=0;
@@ -373,6 +417,73 @@ bool FFMPegDecoder::GetVideoFrame(bool restart)
373417
ffmpegerror = true;
374418

375419
return frameFinished!=0;
420+
#else
421+
// libavcodec 57+
422+
if( restart )
423+
{
424+
if(packet.data!=NULL)
425+
av_packet_unref(&packet);
426+
packet.data=NULL;
427+
avcodec_flush_buffers(pCodecCtx);
428+
}
429+
else
430+
{
431+
ret = avcodec_receive_frame(pCodecCtx, pFrame);
432+
if (ret < 0 && ret != AVERROR(EAGAIN))
433+
{
434+
ffmpegerror = true;
435+
return false;
436+
}
437+
}
438+
439+
do
440+
{
441+
do
442+
{
443+
// Free packet
444+
if(packet.data!=NULL)
445+
av_packet_unref(&packet);
446+
447+
// Read new packet
448+
ret = av_read_frame(pFormatCtx, &packet);
449+
if(ret < 0)
450+
{
451+
if (ret == AVERROR_EOF)
452+
{ // create draining packet
453+
packet.data = NULL;
454+
packet.size = 0;
455+
}
456+
else
457+
{
458+
if (packet.data!=NULL)
459+
av_packet_unref(&packet);
460+
ffmpegerror = true;
461+
return false;
462+
}
463+
}
464+
} while(packet.stream_index!=videoStream && ret != AVERROR_EOF);
465+
466+
ret = avcodec_send_packet(pCodecCtx, &packet);
467+
if (packet.data!=NULL)
468+
av_packet_unref(&packet);
469+
470+
if (ret < 0 && ret != AVERROR(EAGAIN))
471+
{
472+
ffmpegerror = true;
473+
return false;
474+
}
475+
476+
ret = avcodec_receive_frame(pCodecCtx, pFrame);
477+
if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
478+
{
479+
ffmpegerror = true;
480+
return false;
481+
}
482+
483+
} while (ret != 0 && ret != AVERROR_EOF);
484+
485+
return ret != AVERROR_EOF;
486+
#endif
376487
}
377488

378489

@@ -505,7 +616,11 @@ void FFMPegDecoder::resetDecoder()
505616
}
506617
if( pFrame )
507618
av_free(pFrame);
619+
#if LIBAVCODEC_VERSION_MAJOR < 57
508620
pFrame=avcodec_alloc_frame();
621+
#else
622+
pFrame=av_frame_alloc();
623+
#endif
509624
__bufBytes = 0;
510625
}
511626

‎ffmpeg_decoder.h

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ class FFMPegDecoder : public MPEGDecoder
2121

2222
int i, videoStream;
2323
AVCodecContext *pCodecCtx;
24+
#if LIBAVCODEC_VERSION_MAJOR > 56
25+
AVCodecParameters *pCodecPar;
26+
#endif
2427
AVCodec *pCodec;
2528
#if LIBAVCODEC_VERSION_MAJOR > 54
2629
AVDictionary *avDictionary;

0 commit comments

Comments
 (0)