Skip to content

Commit

Permalink
Обновление ffmpeg git-n7.1-dev-1370-gbe2cabce32.
Browse files Browse the repository at this point in the history
  • Loading branch information
@v0lt
v0lt committed Jun 15, 2024
1 parent 3df268f commit ec55f07
Show file tree
Hide file tree
Showing 110 changed files with 5,424 additions and 3,170 deletions.
2 changes: 1 addition & 1 deletion docs/Changelog.Rus.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Обновлен японский перевод (автор tsubasanouta).

Обновлены библиотеки:
ffmpeg git-n7.1-dev-1158-g7560db937d.
ffmpeg git-n7.1-dev-1370-gbe2cabce32.


1.7.2 - 2024-06-07
Expand Down
2 changes: 1 addition & 1 deletion docs/Changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Updated Korean translation (by Hackjjang).
Updated Japanese translation (by tsubasanouta).

Updated libraries:
ffmpeg git-n7.1-dev-1158-g7560db937d.
ffmpeg git-n7.1-dev-1370-gbe2cabce32.


1.7.2 - 2024-06-07
Expand Down
29 changes: 14 additions & 15 deletions src/ExtLib/ffmpeg/libavcodec/aac/aacdec_usac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,9 @@ static int decode_usac_scale_factors(AACDecContext *ac,
*
* @return Returns error status. 0 - OK, !0 - error
*/
static int decode_spectrum_and_dequant_ac(AACDecContext *s, float coef[1024],
GetBitContext *gb, const float sf[120],
AACArithState *state, int reset,
uint16_t len, uint16_t N)
static int decode_spectrum_ac(AACDecContext *s, float coef[1024],
GetBitContext *gb, AACArithState *state,
int reset, uint16_t len, uint16_t N)
{
AACArith ac;
int i, a, b;
Expand Down Expand Up @@ -691,10 +690,6 @@ static int decode_usac_stereo_cplx(AACDecContext *ac, AACUsacStereo *us,
if (!indep_flag)
delta_code_time = get_bits1(gb);

/* Alpha values must be zeroed out if pred_used is 0. */
memset(us->alpha_q_re, 0, sizeof(us->alpha_q_re));
memset(us->alpha_q_im, 0, sizeof(us->alpha_q_im));

/* TODO: shouldn't be needed */
for (int g = 0; g < num_window_groups; g++) {
for (int sfb = 0; sfb < cpe->max_sfb_ste; sfb += SFB_PER_PRED_BAND) {
Expand Down Expand Up @@ -829,6 +824,11 @@ static int decode_usac_stereo_info(AACDecContext *ac, AACUSACConfig *usac,
us->common_window = 0;
us->common_tw = 0;

/* Alpha values must always be zeroed out for the current frame,
* as they are propagated to the next frame and may be used. */
memset(us->alpha_q_re, 0, sizeof(us->alpha_q_re));
memset(us->alpha_q_im, 0, sizeof(us->alpha_q_im));

if (!(!ue1->core_mode && !ue2->core_mode))
return 0;

Expand Down Expand Up @@ -971,7 +971,7 @@ static void apply_noise_fill(AACDecContext *ac, SingleChannelElement *sce,
}

if (band_quantized_to_zero)
sce->sf[g*ics->max_sfb + sfb] += noise_offset;
sce->sfo[g*ics->max_sfb + sfb] += noise_offset;
}
coef += g_len << 7;
}
Expand All @@ -987,6 +987,9 @@ static void spectrum_scale(AACDecContext *ac, SingleChannelElement *sce,
if (ue->noise.level)
apply_noise_fill(ac, sce, ue);

/* Noise filling may apply an offset to the scalefactor offset */
ac->dsp.dequant_scalefactors(sce);

/* Apply scalefactors */
coef = sce->coeffs;
for (int g = 0; g < ics->num_window_groups; g++) {
Expand Down Expand Up @@ -1371,8 +1374,6 @@ static int decode_usac_core_coder(AACDecContext *ac, AACUSACConfig *usac,
if (ret < 0)
return ret;

ac->dsp.dequant_scalefactors(sce);

if (ue->tns_data_present) {
sce->tns.present = 1;
ret = ff_aac_decode_tns(ac, &sce->tns, gb, ics);
Expand All @@ -1395,10 +1396,8 @@ static int decode_usac_core_coder(AACDecContext *ac, AACUSACConfig *usac,
else
N = usac->core_frame_len;

ret = decode_spectrum_and_dequant_ac(ac, sce->coeffs + win*128, gb,
sce->sf, &ue->ac,
arith_reset_flag && (win == 0),
lg, N);
ret = decode_spectrum_ac(ac, sce->coeffs + win*128, gb, &ue->ac,
arith_reset_flag && (win == 0), lg, N);
if (ret < 0)
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ExtLib/ffmpeg/libavcodec/adpcm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitC
step_index = av_clip(step_index, 0, 88);

sign = nibble & (1 << shift);
delta = av_mod_uintp2(nibble, shift);
delta = av_zero_extend(nibble, shift);
diff = ((2 * delta + 1) * step) >> shift;
predictor = c->predictor;
if (sign) predictor -= diff;
Expand Down
2 changes: 1 addition & 1 deletion src/ExtLib/ffmpeg/libavcodec/amrwbdec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static void decode_pitch_vector(AMRWBContext *ctx,
}

/** Get x bits in the index interval [lsb,lsb+len-1] inclusive */
#define BIT_STR(x,lsb,len) av_mod_uintp2((x) >> (lsb), (len))
#define BIT_STR(x,lsb,len) av_zero_extend((x) >> (lsb), (len))

/** Get the bit at specified position */
#define BIT_POS(x, p) (((x) >> (p)) & 1)
Expand Down
2 changes: 1 addition & 1 deletion src/ExtLib/ffmpeg/libavcodec/atrac3plus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ static void decode_qu_spectra(GetBitContext *gb, const Atrac3pSpecCodeTab *tab,
val = get_vlc2(gb, vlc_tab->table, vlc_tab->bits, 1);

for (i = 0; i < num_coeffs; i++) {
cf = av_mod_uintp2(val, bits);
cf = av_zero_extend(val, bits);
if (is_signed)
cf = sign_extend(cf, bits);
else if (cf && get_bits1(gb))
Expand Down
4 changes: 1 addition & 3 deletions src/ExtLib/ffmpeg/libavcodec/blockdsp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c)
c->fill_block_tab[0] = fill_block16_c;
c->fill_block_tab[1] = fill_block8_c;

#if ARCH_ALPHA
ff_blockdsp_init_alpha(c);
#elif ARCH_ARM
#if ARCH_ARM
ff_blockdsp_init_arm(c);
#elif ARCH_PPC
ff_blockdsp_init_ppc(c);
Expand Down
2 changes: 1 addition & 1 deletion src/ExtLib/ffmpeg/libavcodec/cbs_h266_syntax_template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3426,7 +3426,7 @@ static int FUNC(slice_header) (CodedBitstreamContext *ctx, RWContext *rw,
current->num_entry_points--;
if (current->num_entry_points > VVC_MAX_ENTRY_POINTS) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Too many entry points: "
"%" PRIu16 ".\n", current->num_entry_points);
"%" PRIu32 ".\n", current->num_entry_points);
return AVERROR_PATCHWELCOME;
}
if (current->num_entry_points > 0) {
Expand Down
10 changes: 5 additions & 5 deletions src/ExtLib/ffmpeg/libavcodec/d3d12va_mpeg2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static int d3d12va_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint
{
const MpegEncContext *s = avctx->priv_data;
D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx);
D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = s->cur_pic.ptr->hwaccel_picture_private;

if (!ctx)
return -1;
Expand All @@ -69,7 +69,7 @@ static int d3d12va_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint
static int d3d12va_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
const MpegEncContext *s = avctx->priv_data;
D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = s->cur_pic.ptr->hwaccel_picture_private;

if (ctx_pic->slice_count >= MAX_SLICES) {
return AVERROR(ERANGE);
Expand All @@ -88,7 +88,7 @@ static int d3d12va_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buff
static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *input_args, ID3D12Resource *buffer)
{
const MpegEncContext *s = avctx->priv_data;
D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = s->cur_pic.ptr->hwaccel_picture_private;

const int is_field = s->picture_structure != PICT_FRAME;
const unsigned mb_count = s->mb_width * (s->mb_height >> is_field);
Expand Down Expand Up @@ -137,12 +137,12 @@ static int d3d12va_mpeg2_end_frame(AVCodecContext *avctx)
{
int ret;
MpegEncContext *s = avctx->priv_data;
D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = s->cur_pic.ptr->hwaccel_picture_private;

if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
return -1;

ret = ff_d3d12va_common_end_frame(avctx, s->current_picture_ptr->f, &ctx_pic->pp, sizeof(ctx_pic->pp),
ret = ff_d3d12va_common_end_frame(avctx, s->cur_pic.ptr->f, &ctx_pic->pp, sizeof(ctx_pic->pp),
&ctx_pic->qm, sizeof(ctx_pic->qm), update_input_arguments);
if (!ret)
ff_mpeg_draw_horiz_band(s, 0, avctx->height);
Expand Down
10 changes: 5 additions & 5 deletions src/ExtLib/ffmpeg/libavcodec/d3d12va_vc1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static int d3d12va_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_
{
const VC1Context *v = avctx->priv_data;
D3D12VADecodeContext *ctx = D3D12VA_DECODE_CONTEXT(avctx);
D3D12DecodePictureContext *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = v->s.cur_pic.ptr->hwaccel_picture_private;

if (!ctx)
return -1;
Expand All @@ -67,7 +67,7 @@ static int d3d12va_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_
static int d3d12va_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
{
const VC1Context *v = avctx->priv_data;
D3D12DecodePictureContext *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = v->s.cur_pic.ptr->hwaccel_picture_private;

if (ctx_pic->slice_count >= MAX_SLICES) {
return AVERROR(ERANGE);
Expand All @@ -93,7 +93,7 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU
{
const VC1Context *v = avctx->priv_data;
const MpegEncContext *s = &v->s;
D3D12DecodePictureContext *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = s->cur_pic.ptr->hwaccel_picture_private;
D3D12_VIDEO_DECODE_FRAME_ARGUMENT *args = &input_args->FrameArguments[input_args->NumFrameArguments++];

const unsigned mb_count = s->mb_width * (s->mb_height >> v->field_mode);
Expand Down Expand Up @@ -151,12 +151,12 @@ static int update_input_arguments(AVCodecContext *avctx, D3D12_VIDEO_DECODE_INPU
static int d3d12va_vc1_end_frame(AVCodecContext *avctx)
{
const VC1Context *v = avctx->priv_data;
D3D12DecodePictureContext *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
D3D12DecodePictureContext *ctx_pic = v->s.cur_pic.ptr->hwaccel_picture_private;

if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
return -1;

return ff_d3d12va_common_end_frame(avctx, v->s.current_picture_ptr->f,
return ff_d3d12va_common_end_frame(avctx, v->s.cur_pic.ptr->f,
&ctx_pic->pp, sizeof(ctx_pic->pp),
NULL, 0,
update_input_arguments);
Expand Down
4 changes: 2 additions & 2 deletions src/ExtLib/ffmpeg/libavcodec/dovi_rpudec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm)
dm->l2.trim_power = get_bits(gb, 12);
dm->l2.trim_chroma_weight = get_bits(gb, 12);
dm->l2.trim_saturation_gain = get_bits(gb, 12);
dm->l2.ms_weight = get_bits(gb, 13) - 8192;
dm->l2.ms_weight = get_sbits(gb, 13);
break;
case 4:
dm->l4.anchor_pq = get_bits(gb, 12);
Expand Down Expand Up @@ -197,7 +197,7 @@ static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm,
dm->l8.trim_power = get_bits(gb, 12);
dm->l8.trim_chroma_weight = get_bits(gb, 12);
dm->l8.trim_saturation_gain = get_bits(gb, 12);
dm->l8.ms_weight = get_bits(gb, 12) - 8192;
dm->l8.ms_weight = get_bits(gb, 12);
if (ext_block_length < 12)
break;
dm->l8.target_mid_contrast = get_bits(gb, 12);
Expand Down
8 changes: 4 additions & 4 deletions src/ExtLib/ffmpeg/libavcodec/dxva2_hevc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ void ff_dxva2_hevc_fill_picture_parameters(const AVCodecContext *avctx, AVDXVACo
{
const HEVCContext *h = avctx->priv_data;
const HEVCFrame *current_picture = h->cur_frame;
const HEVCSPS *sps = h->ps.sps;
const HEVCPPS *pps = h->ps.pps;
const HEVCPPS *pps = h->pps;
const HEVCSPS *sps = pps->sps;
int i, j;
// ==> Start patch MPC
DXVA_PicParams_HEVC *pp = &ppext->main;
Expand Down Expand Up @@ -246,8 +246,8 @@ void ff_dxva2_hevc_fill_scaling_lists(const AVCodecContext *avctx, AVDXVAContext
{
const HEVCContext *h = avctx->priv_data;
unsigned i, j, pos;
const ScalingList *sl = h->ps.pps->scaling_list_data_present_flag ?
&h->ps.pps->scaling_list : &h->ps.sps->scaling_list;
const ScalingList *sl = h->pps->scaling_list_data_present_flag ?
&h->pps->scaling_list : &h->pps->sps->scaling_list;

memset(qm, 0, sizeof(*qm));
for (i = 0; i < 6; i++) {
Expand Down
16 changes: 8 additions & 8 deletions src/ExtLib/ffmpeg/libavcodec/dxva2_mpeg2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ void ff_dxva2_mpeg2_fill_picture_parameters(AVCodecContext *avctx,
DXVA_PictureParameters *pp)
{
const struct MpegEncContext *s = avctx->priv_data;
const Picture *current_picture = s->current_picture_ptr;
const MPVPicture *current_picture = s->cur_pic.ptr;
int is_field = s->picture_structure != PICT_FRAME;

memset(pp, 0, sizeof(*pp));
pp->wDeblockedPictureIndex = 0;
if (s->pict_type != AV_PICTURE_TYPE_I)
pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f, 0);
pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_pic.ptr->f, 0);
else
pp->wForwardRefPictureIndex = 0xffff;
if (s->pict_type == AV_PICTURE_TYPE_B)
pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f, 0);
pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_pic.ptr->f, 0);
else
pp->wBackwardRefPictureIndex = 0xffff;
pp->wDecodedPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, current_picture->f, 1);
Expand Down Expand Up @@ -157,7 +157,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
const struct MpegEncContext *s = avctx->priv_data;
AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
s->cur_pic.ptr->hwaccel_picture_private;
const int is_field = s->picture_structure != PICT_FRAME;
const unsigned mb_count = s->mb_width * (s->mb_height >> is_field);
void *dxva_data_ptr;
Expand Down Expand Up @@ -260,7 +260,7 @@ static int dxva2_mpeg2_start_frame(AVCodecContext *avctx,
const struct MpegEncContext *s = avctx->priv_data;
AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
s->cur_pic.ptr->hwaccel_picture_private;

if (!DXVA_CONTEXT_VALID(avctx, ctx))
return -1;
Expand All @@ -280,7 +280,7 @@ static int dxva2_mpeg2_decode_slice(AVCodecContext *avctx,
{
const struct MpegEncContext *s = avctx->priv_data;
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
s->cur_pic.ptr->hwaccel_picture_private;
unsigned position;

if (ctx_pic->slice_count >= MAX_SLICES) {
Expand All @@ -302,12 +302,12 @@ static int dxva2_mpeg2_end_frame(AVCodecContext *avctx)
{
struct MpegEncContext *s = avctx->priv_data;
struct dxva2_picture_context *ctx_pic =
s->current_picture_ptr->hwaccel_picture_private;
s->cur_pic.ptr->hwaccel_picture_private;
int ret;

if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
return -1;
ret = ff_dxva2_common_end_frame(avctx, s->current_picture_ptr->f,
ret = ff_dxva2_common_end_frame(avctx, s->cur_pic.ptr->f,
&ctx_pic->pp, sizeof(ctx_pic->pp),
&ctx_pic->qm, sizeof(ctx_pic->qm),
commit_bitstream_and_slice_buffer);
Expand Down
20 changes: 10 additions & 10 deletions src/ExtLib/ffmpeg/libavcodec/dxva2_vc1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx,
{
const VC1Context *v = avctx->priv_data;
const MpegEncContext *s = &v->s;
const Picture *current_picture = s->current_picture_ptr;
const MPVPicture *current_picture = s->cur_pic.ptr;
int intcomp = 0;

// determine if intensity compensation is needed
Expand All @@ -58,12 +58,12 @@ void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx,
}

memset(pp, 0, sizeof(*pp));
if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type)
pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_picture.f, 0);
if (s->pict_type != AV_PICTURE_TYPE_I && !v->bi_type && s->last_pic.ptr)
pp->wForwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->last_pic.ptr->f, 0);
else
pp->wForwardRefPictureIndex = 0xffff;
if (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type)
pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_picture.f, 0);
if (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type && s->next_pic.ptr)
pp->wBackwardRefPictureIndex = ff_dxva2_get_surface_index(avctx, ctx, s->next_pic.ptr->f, 0);
else
pp->wBackwardRefPictureIndex = 0xffff;
pp->wDecodedPictureIndex =
Expand Down Expand Up @@ -191,7 +191,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
const VC1Context *v = avctx->priv_data;
AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
const MpegEncContext *s = &v->s;
struct dxva2_picture_context *ctx_pic = s->current_picture_ptr->hwaccel_picture_private;
struct dxva2_picture_context *ctx_pic = s->cur_pic.ptr->hwaccel_picture_private;

static const uint8_t start_code[] = { 0, 0, 1, 0x0d };
const unsigned start_code_size = avctx->codec_id == AV_CODEC_ID_VC1 ? sizeof(start_code) : 0;
Expand Down Expand Up @@ -317,7 +317,7 @@ static int dxva2_vc1_start_frame(AVCodecContext *avctx,
{
const VC1Context *v = avctx->priv_data;
AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
struct dxva2_picture_context *ctx_pic = v->s.cur_pic.ptr->hwaccel_picture_private;

if (!DXVA_CONTEXT_VALID(avctx, ctx))
return -1;
Expand All @@ -336,7 +336,7 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx,
uint32_t size)
{
const VC1Context *v = avctx->priv_data;
const Picture *current_picture = v->s.current_picture_ptr;
const MPVPicture *current_picture = v->s.cur_pic.ptr;
struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
unsigned position;

Expand Down Expand Up @@ -364,13 +364,13 @@ static int dxva2_vc1_decode_slice(AVCodecContext *avctx,
static int dxva2_vc1_end_frame(AVCodecContext *avctx)
{
VC1Context *v = avctx->priv_data;
struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->hwaccel_picture_private;
struct dxva2_picture_context *ctx_pic = v->s.cur_pic.ptr->hwaccel_picture_private;
int ret;

if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0)
return -1;

ret = ff_dxva2_common_end_frame(avctx, v->s.current_picture_ptr->f,
ret = ff_dxva2_common_end_frame(avctx, v->s.cur_pic.ptr->f,
&ctx_pic->pp, sizeof(ctx_pic->pp),
NULL, 0,
commit_bitstream_and_slice_buffer);
Expand Down
Loading

0 comments on commit ec55f07

Please sign in to comment.