if (ret == AVERROR_EOF)
avci->draining_done = 1;
+ /* unwrap the per-frame decode data and restore the original opaque_ref*/
+ if (!ret) {
+ /* the only case where decode data is not set should be decoders
+ * that do not call ff_get_buffer() */
+ av_assert0((frame->opaque_ref && frame->opaque_ref->size == sizeof(FrameDecodeData)) ||
+ !(avctx->codec->capabilities & AV_CODEC_CAP_DR1));
+
+ if (frame->opaque_ref) {
+ FrameDecodeData *fdd;
+ AVBufferRef *user_opaque_ref;
+
+ fdd = (FrameDecodeData*)frame->opaque_ref->data;
+
+ if (fdd->post_process) {
+ ret = fdd->post_process(avctx, frame);
+ if (ret < 0) {
+ av_frame_unref(frame);
+ return ret;
+ }
+ }
+
+ user_opaque_ref = fdd->user_opaque_ref;
+ fdd->user_opaque_ref = NULL;
+ av_buffer_unref(&frame->opaque_ref);
+ frame->opaque_ref = user_opaque_ref;
+ }
+ }
+
return ret;
}
return 0;
}
-static int calc_cropping_offsets(size_t offsets[4], const AVFrame *frame,
- const AVPixFmtDescriptor *desc)
-{
- int i, j;
-
- for (i = 0; frame->data[i]; i++) {
- const AVComponentDescriptor *comp = NULL;
- int shift_x = (i == 1 || i == 2) ? desc->log2_chroma_w : 0;
- int shift_y = (i == 1 || i == 2) ? desc->log2_chroma_h : 0;
-
- if (desc->flags & (AV_PIX_FMT_FLAG_PAL | AV_PIX_FMT_FLAG_PSEUDOPAL) && i == 1) {
- offsets[i] = 0;
- break;
- }
-
- /* find any component descriptor for this plane */
- for (j = 0; j < desc->nb_components; j++) {
- if (desc->comp[j].plane == i) {
- comp = &desc->comp[j];
- break;
- }
- }
- if (!comp)
- return AVERROR_BUG;
-
- offsets[i] = (frame->crop_top >> shift_y) * frame->linesize[i] +
- (frame->crop_left >> shift_x) * comp->step;
- }
-
- return 0;
-}
-
static int apply_cropping(AVCodecContext *avctx, AVFrame *frame)
{
- const AVPixFmtDescriptor *desc;
- size_t offsets[4];
- int i;
-
/* make sure we are noisy about decoders returning invalid cropping data */
if (frame->crop_left >= INT_MAX - frame->crop_right ||
frame->crop_top >= INT_MAX - frame->crop_bottom ||
if (!avctx->apply_cropping)
return 0;
- desc = av_pix_fmt_desc_get(frame->format);
- if (!desc)
- return AVERROR_BUG;
-
- /* Apply just the right/bottom cropping for hwaccel formats. Bitstream
- * formats cannot be easily handled here either (and corresponding decoders
- * should not export any cropping anyway), so do the same for those as well.
- * */
- if (desc->flags & (AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_HWACCEL)) {
- frame->width -= frame->crop_right;
- frame->height -= frame->crop_bottom;
- frame->crop_right = 0;
- frame->crop_bottom = 0;
- return 0;
- }
-
- /* calculate the offsets for each plane */
- calc_cropping_offsets(offsets, frame, desc);
-
- /* adjust the offsets to avoid breaking alignment */
- if (!(avctx->flags & AV_CODEC_FLAG_UNALIGNED)) {
- int log2_crop_align = frame->crop_left ? av_ctz(frame->crop_left) : INT_MAX;
- int min_log2_align = INT_MAX;
-
- for (i = 0; frame->data[i]; i++) {
- int log2_align = offsets[i] ? av_ctz(offsets[i]) : INT_MAX;
- min_log2_align = FFMIN(log2_align, min_log2_align);
- }
-
- /* we assume, and it should always be true, that the data alignment is
- * related to the cropping alignment by a constant power-of-2 factor */
- if (log2_crop_align < min_log2_align)
- return AVERROR_BUG;
-
- if (min_log2_align < 5) {
- frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1);
- calc_cropping_offsets(offsets, frame, desc);
- }
- }
-
- for (i = 0; frame->data[i]; i++)
- frame->data[i] += offsets[i];
-
- frame->width -= (frame->crop_left + frame->crop_right);
- frame->height -= (frame->crop_top + frame->crop_bottom);
- frame->crop_left = 0;
- frame->crop_right = 0;
- frame->crop_top = 0;
- frame->crop_bottom = 0;
-
- return 0;
+ return av_frame_apply_cropping(frame, avctx->flags & AV_CODEC_FLAG_UNALIGNED ?
+ AV_FRAME_CROP_UNALIGNED : 0);
}
int attribute_align_arg avcodec_receive_frame(AVCodecContext *avctx, AVFrame *frame)
return AVERROR(ENOMEM);
}
+ avctx->hwaccel = hwa;
if (hwa->init) {
ret = hwa->init(avctx);
if (ret < 0) {
av_freep(&avctx->internal->hwaccel_priv_data);
+ avctx->hwaccel = NULL;
return ret;
}
}
- avctx->hwaccel = hwa;
-
return 0;
}
{
int ret;
- if (avctx->hw_frames_ctx)
- return av_hwframe_get_buffer(avctx->hw_frames_ctx, frame, 0);
+ if (avctx->hw_frames_ctx) {
+ ret = av_hwframe_get_buffer(avctx->hw_frames_ctx, frame, 0);
+ frame->width = avctx->coded_width;
+ frame->height = avctx->coded_height;
+ return ret;
+ }
if ((ret = update_frame_pool(avctx, frame)) < 0)
return ret;
return 0;
}
+static void decode_data_free(void *opaque, uint8_t *data)
+{
+ FrameDecodeData *fdd = (FrameDecodeData*)data;
+
+ av_buffer_unref(&fdd->user_opaque_ref);
+
+ if (fdd->post_process_opaque_free)
+ fdd->post_process_opaque_free(fdd->post_process_opaque);
+
+ if (fdd->hwaccel_priv_free)
+ fdd->hwaccel_priv_free(fdd->hwaccel_priv);
+
+ av_freep(&fdd);
+}
+
+static int attach_decode_data(AVFrame *frame)
+{
+ AVBufferRef *fdd_buf;
+ FrameDecodeData *fdd;
+
+ fdd = av_mallocz(sizeof(*fdd));
+ if (!fdd)
+ return AVERROR(ENOMEM);
+
+ fdd_buf = av_buffer_create((uint8_t*)fdd, sizeof(*fdd), decode_data_free,
+ NULL, AV_BUFFER_FLAG_READONLY);
+ if (!fdd_buf) {
+ av_freep(&fdd);
+ return AVERROR(ENOMEM);
+ }
+
+ fdd->user_opaque_ref = frame->opaque_ref;
+ frame->opaque_ref = fdd_buf;
+
+ return 0;
+}
+
int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
{
const AVHWAccel *hwaccel = avctx->hwaccel;
avctx->sw_pix_fmt = avctx->pix_fmt;
ret = avctx->get_buffer2(avctx, frame, flags);
+ if (ret < 0)
+ goto end;
+
+ ret = attach_decode_data(frame);
+ if (ret < 0)
+ goto end;
end:
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions &&
frame->height = avctx->height;
}
+ if (ret < 0)
+ av_frame_unref(frame);
+
return ret;
}
projects / ffmpeg / blobdiff