History

ffmpeg: adapt to the buffersrc API changes.

Nicolas George committed 14 years ago

Commit 00be2f51 parent aa1246e1 file · +4 −27Browse files

Unified · Split

ffmpeg.c+4−27
@@ -810,13 +810,8 @@ static int configure_audio_filters(FilterGraph *fg, AVFilterContext **in_filter, · 809 unmodified lines
810810 if (!(fg->graph = avfilter_graph_alloc()))
811811 return AVERROR(ENOMEM);
812812
813−#ifdef SRCA
814813 snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:"
815814 "channel_layout=0x%"PRIx64, ist->st->time_base.num,
816−#else
817− snprintf(args, sizeof(args), "%d/%d:%d:%s:"
818− "0x%"PRIx64, ist->st->time_base.num,
819−#endif
820815 ist->st->time_base.den, icodec->sample_rate,
821816 av_get_sample_fmt_name(icodec->sample_fmt), icodec->channel_layout);
822817 ret = avfilter_graph_create_filter(&fg->inputs[0]->filter,
@@ -2426,11 +2421,8 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) · 1603 unmodified lines
24262421 /* no audio frame */
24272422 if (!pkt->size)
24282423 for (i = 0; i < ist->nb_filters; i++)
2429−#ifdef SRCA
2430− av_buffersrc_buffer(ist->filters[i]->filter, NULL);
2431−#else
2432− av_buffersrc_add_ref(ist->filters[i]->filter, NULL, 0);
2433−#endif
2424+ av_buffersrc_add_ref(ist->filters[i]->filter, NULL,
2425+ AV_BUFFERSRC_FLAG_NO_COPY);
24342426 return ret;
24352427 }
24362428
@@ -2497,13 +2489,8 @@ static int transcode_audio(InputStream *ist, AVPacket *pkt, int *got_output) · 60 unmodified lines
24972489 }
24982490 }
24992491
2500− for (i = 0; i < ist->nb_filters; i++) {
2501−#ifdef SRCA
2502− av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame);
2503−#else
2492+ for (i = 0; i < ist->nb_filters; i++)
25042493 av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, 0);
2505−#endif
2506− }
25072494
25082495 return ret;
25092496 }
@@ -2538,11 +2525,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int · 28 unmodified lines
25382525 /* no picture yet */
25392526 if (!pkt->size)
25402527 for (i = 0; i < ist->nb_filters; i++)
2541−#ifdef SRCA
2542− av_buffersrc_buffer(ist->filters[i]->filter, NULL);
2543−#else
2544− av_buffersrc_add_ref(ist->filters[i]->filter, NULL, 0);
2545−#endif
2528+ av_buffersrc_add_ref(ist->filters[i]->filter, NULL, AV_BUFFERSRC_FLAG_NO_COPY);
25462529 return ret;
25472530 }
25482531
@@ -2606,17 +2589,11 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int · 57 unmodified lines
26062589
26072590 av_assert0(buf->refcount>0);
26082591 buf->refcount++;
2609−#ifdef SRCA
2610− av_buffersrc_buffer(ist->filters[i]->filter, fb);
2611− } else
2612− if(av_buffersrc_write_frame(ist->filters[i]->filter, decoded_frame)<0) {
2613−#else
26142592 av_buffersrc_add_ref(ist->filters[i]->filter, fb,
26152593 AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT |
26162594 AV_BUFFERSRC_FLAG_NO_COPY);
26172595 } else
26182596 if(av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame, 0)<0) {
2619−#endif
26202597 av_log(NULL, AV_LOG_FATAL, "Failed to inject frame into filter network\n");
26212598 exit_program(1);
26222599 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t