virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-19 05:33:15 +02:00
Code Issues Releases Activity

avcodec/libx265: export encoded frame stats

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 66b6005301894823052b437a950003ffbe3ba6de)
This commit is contained in:
James Almer 2019-12-28 13:34:19 -03:00
parent 278a91f8fe
commit 3670a10c2d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/libx265.c
View File

@ -482,6 +482,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
x265_picture x265pic_out = { 0 }; x265_picture x265pic_out = { 0 };
x265_nal *nal; x265_nal *nal;
uint8_t *dst; uint8_t *dst;
int pict_type;
int payload = 0; int payload = 0;
int nnal; int nnal;
int ret; int ret;
@ -541,20 +542,23 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
pkt->pts = x265pic_out.pts; pkt->pts = x265pic_out.pts;
pkt->dts = x265pic_out.dts; pkt->dts = x265pic_out.dts;
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
switch (x265pic_out.sliceType) { switch (x265pic_out.sliceType) {
case X265_TYPE_IDR: case X265_TYPE_IDR:
case X265_TYPE_I: case X265_TYPE_I:
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; pict_type = AV_PICTURE_TYPE_I;
break; break;
case X265_TYPE_P: case X265_TYPE_P:
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; pict_type = AV_PICTURE_TYPE_P;
break; break;
case X265_TYPE_B: case X265_TYPE_B:
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_B; case X265_TYPE_BREF:
pict_type = AV_PICTURE_TYPE_B;
break; break;
} }
#if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS
avctx->coded_frame->pict_type = pict_type;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
@ -565,6 +569,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
pkt->flags |= AV_PKT_FLAG_DISPOSABLE; pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
*got_packet = 1; *got_packet = 1;
return 0; return 0;
} }

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 65 #define LIBAVCODEC_VERSION_MINOR 65
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \