| Message ID | 1490627033-49292-1-git-send-email-rsbultje@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8c2aa45d4a99dc0d9990dfb56782487006f718c3 |
| Headers | show |
On Mon, Mar 27, 2017 at 11:03:53AM -0400, Ronald S. Bultje wrote: > The patch introduces race conditions. > --- > libavcodec/h264_slice.c | 3 --- > libavcodec/h264dec.c | 24 ------------------------ > libavcodec/h264dec.h | 8 -------- > 3 files changed, 35 deletions(-) As this reverts a patch from andreas, this should be CC-ed to him thus added CC [...]
On Mon, 27 Mar 2017 21:54:49 +0200 Michael Niedermayer <michael@niedermayer.cc> wrote: > On Mon, Mar 27, 2017 at 11:03:53AM -0400, Ronald S. Bultje wrote: > > The patch introduces race conditions. > > --- > > libavcodec/h264_slice.c | 3 --- > > libavcodec/h264dec.c | 24 ------------------------ > > libavcodec/h264dec.h | 8 -------- > > 3 files changed, 35 deletions(-) > > As this reverts a patch from andreas, this should be CC-ed to him > thus added CC Shouldn't he be on the list?
On Mon, Mar 27, 2017 at 10:26:38PM +0200, wm4 wrote: > On Mon, 27 Mar 2017 21:54:49 +0200 > Michael Niedermayer <michael@niedermayer.cc> wrote: > > > On Mon, Mar 27, 2017 at 11:03:53AM -0400, Ronald S. Bultje wrote: > > > The patch introduces race conditions. > > > --- > > > libavcodec/h264_slice.c | 3 --- > > > libavcodec/h264dec.c | 24 ------------------------ > > > libavcodec/h264dec.h | 8 -------- > > > 3 files changed, 35 deletions(-) > > > > As this reverts a patch from andreas, this should be CC-ed to him > > thus added CC > > Shouldn't he be on the list? yes, he hasnt posted anything since over a month though so iam not sure if he follows things activly atm [...]
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a703853..fa1e9ae 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -383,9 +383,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->picture_structure = h1->picture_structure; h->mb_aff_frame = h1->mb_aff_frame; h->droppable = h1->droppable; - h->backup_width = h1->backup_width; - h->backup_height = h1->backup_height; - h->backup_pix_fmt = h1->backup_pix_fmt; for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) { ff_h264_unref_picture(h, &h->DPB[i]); diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 9042169..5f37618 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -307,9 +307,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h) int i; h->avctx = avctx; - h->backup_width = -1; - h->backup_height = -1; - h->backup_pix_fmt = AV_PIX_FMT_NONE; h->cur_chroma_format_idc = -1; h->picture_structure = PICT_FRAME; @@ -861,14 +858,6 @@ static int output_frame(H264Context *h, AVFrame *dst, H264Picture *srcp) av_dict_set(&dst->metadata, "stereo_mode", ff_h264_sei_stereo_mode(&h->sei.frame_packing), 0); - h->backup_width = h->avctx->width; - h->backup_height = h->avctx->height; - h->backup_pix_fmt = h->avctx->pix_fmt; - - h->avctx->width = dst->width; - h->avctx->height = dst->height; - h->avctx->pix_fmt = dst->format; - if (srcp->sei_recovery_frame_cnt == 0) dst->key_frame = 1; if (!srcp->crop) @@ -1003,19 +992,6 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data, h->setup_finished = 0; h->nb_slice_ctx_queued = 0; - if (h->backup_width != -1) { - avctx->width = h->backup_width; - h->backup_width = -1; - } - if (h->backup_height != -1) { - avctx->height = h->backup_height; - h->backup_height = -1; - } - if (h->backup_pix_fmt != AV_PIX_FMT_NONE) { - avctx->pix_fmt = h->backup_pix_fmt; - h->backup_pix_fmt = AV_PIX_FMT_NONE; - } - ff_h264_unref_picture(h, &h->last_pic_for_ec); /* end of stream, output what is still in the buffers */ diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 5f868b7..e994f7e 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -363,14 +363,6 @@ typedef struct H264Context { int width, height; int chroma_x_shift, chroma_y_shift; - /** - * Backup frame properties: needed, because they can be different - * between returned frame and last decoded frame. - **/ - int backup_width; - int backup_height; - enum AVPixelFormat backup_pix_fmt; - int droppable; int coded_picture_number;