mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
9772ba1b6a
The opaque parameter for the callback is set in videotoolbox_start(), called when the hwaccel is initialized. When frame threading is used, avctx will be the context corresponding to the frame thread currently doing the decoding. Using this same codec context in all subsequent invocations of the decoder callback (even those triggered by a different frame thread) is unsafe, and broken aftercc867f2c09
, since each frame thread now cleans up its hwaccel state after decoding each frame. Fix this by passing hwaccel_priv_data as the opaque parameter, which exists in a single instance forwarded between all frame threads. The only other use of AVCodecContext in the decoder output callback is as a logging context. For this purpose, store a logging context in hwaccel_priv_data. (cherry picked from commitd7f4ad88a0
) Signed-off-by: Anton Khirnov <anton@khirnov.net>
72 lines
2.8 KiB
C
72 lines
2.8 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_VT_INTERNAL_H
|
|
#define AVCODEC_VT_INTERNAL_H
|
|
|
|
#include "avcodec.h"
|
|
#include "videotoolbox.h"
|
|
|
|
typedef struct VTContext {
|
|
// The current bitstream buffer.
|
|
uint8_t *bitstream;
|
|
|
|
// The current size of the bitstream.
|
|
int bitstream_size;
|
|
|
|
// The reference size used for fast reallocation.
|
|
int allocated_size;
|
|
|
|
// The core video buffer
|
|
CVImageBufferRef frame;
|
|
|
|
// Current dummy frames context (depends on exact CVImageBufferRef params).
|
|
struct AVBufferRef *cached_hw_frames_ctx;
|
|
|
|
// Non-NULL if the new hwaccel API is used. This is only a separate struct
|
|
// to ease compatibility with the old API.
|
|
struct AVVideotoolboxContext *vt_ctx;
|
|
|
|
// Current H264 parameters (used to trigger decoder restart on SPS changes).
|
|
uint8_t sps[3];
|
|
bool reconfig_needed;
|
|
|
|
void *logctx;
|
|
} VTContext;
|
|
|
|
int ff_videotoolbox_alloc_frame(AVCodecContext *avctx, AVFrame *frame);
|
|
int ff_videotoolbox_common_init(AVCodecContext *avctx);
|
|
int ff_videotoolbox_frame_params(AVCodecContext *avctx,
|
|
AVBufferRef *hw_frames_ctx);
|
|
int ff_videotoolbox_buffer_copy(VTContext *vtctx,
|
|
const uint8_t *buffer,
|
|
uint32_t size);
|
|
int ff_videotoolbox_uninit(AVCodecContext *avctx);
|
|
int ff_videotoolbox_h264_start_frame(AVCodecContext *avctx,
|
|
const uint8_t *buffer,
|
|
uint32_t size);
|
|
int ff_videotoolbox_h264_decode_slice(AVCodecContext *avctx,
|
|
const uint8_t *buffer,
|
|
uint32_t size);
|
|
int ff_videotoolbox_common_end_frame(AVCodecContext *avctx, AVFrame *frame);
|
|
CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx);
|
|
CFDataRef ff_videotoolbox_hvcc_extradata_create(AVCodecContext *avctx);
|
|
CFDataRef ff_videotoolbox_vpcc_extradata_create(AVCodecContext *avctx);
|
|
|
|
#endif /* AVCODEC_VT_INTERNAL_H */
|