History

mpegvideo: Rework various functions not to use MpegEncContext directly

Vittorio Giovara committed 11 years ago

Commit 4e179461 parent a3f4c934 files · +22 −21Browse files

Unified · Split

4 files
  1. libavcodec/h263dec.c +1 −1
  2. libavcodec/mpegvideo.c +17 −17
  3. libavcodec/mpegvideo.h +2 −1
  4. libavcodec/mpegvideo_enc.c +2 −2
libavcodec/h263dec.c+1−1
@@ -463,7 +463,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, · 462 unmodified lines
463463 }
464464
465465 if (!s->current_picture_ptr || s->current_picture_ptr->f->data[0]) {
466− int i = ff_find_unused_picture(s, 0);
466+ int i = ff_find_unused_picture(s->avctx, s->picture, 0);
467467 if (i < 0)
468468 return i;
469469 s->current_picture_ptr = &s->picture[i];
libavcodec/mpegvideo.c+17−17
@@ -1612,18 +1612,18 @@ av_cold void ff_init_vlc_rl(RLTable *rl) · 1611 unmodified lines
16121612 }
16131613 }
16141614
1615−static void release_unused_pictures(MpegEncContext *s)
1615+static void release_unused_pictures(AVCodecContext *avctx, Picture *picture)
16161616 {
16171617 int i;
16181618
16191619 /* release non reference frames */
16201620 for (i = 0; i < MAX_PICTURE_COUNT; i++) {
1621− if (!s->picture[i].reference)
1622− ff_mpeg_unref_picture(s->avctx, &s->picture[i]);
1621+ if (!picture[i].reference)
1622+ ff_mpeg_unref_picture(avctx, &picture[i]);
16231623 }
16241624 }
16251625
1626−static inline int pic_is_unused(MpegEncContext *s, Picture *pic)
1626+static inline int pic_is_unused(Picture *pic)
16271627 {
16281628 if (!pic->f->buf[0])
16291629 return 1;
@@ -1632,18 +1632,18 @@ static inline int pic_is_unused(MpegEncContext *s, Picture *pic) · 2 unmodified lines
16321632 return 0;
16331633 }
16341634
1635−static int find_unused_picture(MpegEncContext *s, int shared)
1635+static int find_unused_picture(Picture *picture, int shared)
16361636 {
16371637 int i;
16381638
16391639 if (shared) {
16401640 for (i = 0; i < MAX_PICTURE_COUNT; i++) {
1641− if (!s->picture[i].f->buf[0])
1641+ if (!picture[i].f->buf[0])
16421642 return i;
16431643 }
16441644 } else {
16451645 for (i = 0; i < MAX_PICTURE_COUNT; i++) {
1646− if (pic_is_unused(s, &s->picture[i]))
1646+ if (pic_is_unused(&picture[i]))
16471647 return i;
16481648 }
16491649 }
@@ -1651,15 +1651,15 @@ static int find_unused_picture(MpegEncContext *s, int shared) · 1 unmodified line
16511651 return AVERROR_INVALIDDATA;
16521652 }
16531653
1654−int ff_find_unused_picture(MpegEncContext *s, int shared)
1654+int ff_find_unused_picture(AVCodecContext *avctx, Picture *picture, int shared)
16551655 {
1656− int ret = find_unused_picture(s, shared);
1656+ int ret = find_unused_picture(picture, shared);
16571657
16581658 if (ret >= 0 && ret < MAX_PICTURE_COUNT) {
1659− if (s->picture[ret].needs_realloc) {
1660− s->picture[ret].needs_realloc = 0;
1661− ff_free_picture_tables(&s->picture[ret]);
1662− ff_mpeg_unref_picture(s->avctx, &s->picture[ret]);
1659+ if (picture[ret].needs_realloc) {
1660+ picture[ret].needs_realloc = 0;
1661+ ff_free_picture_tables(&picture[ret]);
1662+ ff_mpeg_unref_picture(avctx, &picture[ret]);
16631663 }
16641664 }
16651665 return ret;
@@ -1697,14 +1697,14 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) · 31 unmodified lines
16971697
16981698 ff_mpeg_unref_picture(s->avctx, &s->current_picture);
16991699
1700− release_unused_pictures(s);
1700+ release_unused_pictures(s->avctx, s->picture);
17011701
17021702 if (s->current_picture_ptr && !s->current_picture_ptr->f->buf[0]) {
17031703 // we already have a unused image
17041704 // (maybe it was set before reading the header)
17051705 pic = s->current_picture_ptr;
17061706 } else {
1707− i = ff_find_unused_picture(s, 0);
1707+ i = ff_find_unused_picture(s->avctx, s->picture, 0);
17081708 if (i < 0) {
17091709 av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
17101710 return i;
@@ -1771,7 +1771,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) · 60 unmodified lines
17711771 "allocate dummy last picture for field based first keyframe\n");
17721772
17731773 /* Allocate a dummy frame */
1774− i = ff_find_unused_picture(s, 0);
1774+ i = ff_find_unused_picture(s->avctx, s->picture, 0);
17751775 if (i < 0) {
17761776 av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
17771777 return i;
@@ -1801,7 +1801,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) · 23 unmodified lines
18011801 if ((!s->next_picture_ptr || !s->next_picture_ptr->f->buf[0]) &&
18021802 s->pict_type == AV_PICTURE_TYPE_B) {
18031803 /* Allocate a dummy frame */
1804− i = ff_find_unused_picture(s, 0);
1804+ i = ff_find_unused_picture(s->avctx, s->picture, 0);
18051805 if (i < 0) {
18061806 av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n");
18071807 return i;
libavcodec/mpegvideo.h+2−1
@@ -742,7 +742,8 @@ void ff_mpeg_draw_horiz_band(MpegEncContext *s, int y, int h); · 741 unmodified lines
742742 void ff_mpeg_flush(AVCodecContext *avctx);
743743 void ff_print_debug_info(MpegEncContext *s, Picture *p);
744744 void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix);
745−int ff_find_unused_picture(MpegEncContext *s, int shared);
745+
746+int ff_find_unused_picture(AVCodecContext *avctx, Picture *picture, int shared);
746747 int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src);
747748 int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src);
748749 void ff_set_qscale(MpegEncContext * s, int qscale);
libavcodec/mpegvideo_enc.c+2−2
@@ -994,7 +994,7 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) · 993 unmodified lines
994994 ff_dlog(s->avctx, "%d %d %td %td\n", pic_arg->linesize[0],
995995 pic_arg->linesize[1], s->linesize, s->uvlinesize);
996996
997− i = ff_find_unused_picture(s, direct);
997+ i = ff_find_unused_picture(s->avctx, s->picture, direct);
998998 if (i < 0)
999999 return i;
10001000
@@ -1379,7 +1379,7 @@ no_output_pic: · 378 unmodified lines
13791379 // one & ensure that the shared one is reuseable
13801380
13811381 Picture *pic;
1382− int i = ff_find_unused_picture(s, 0);
1382+ int i = ff_find_unused_picture(s->avctx, s->picture, 0);
13831383 if (i < 0)
13841384 return i;
13851385 pic = &s->picture[i];

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