Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 530778 Details for
Bug 655440
media-video/transcode-1.1.7 ffmpeg4 patch seems incomplete
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Enhanced patch for ffmpeg-4
transcode-ffmpeg4-fuller.patch (text/plain), 9.56 KB, created by
Ken Moffat
on 2018-05-11 04:25:46 UTC
(
hide
)
Description:
Enhanced patch for ffmpeg-4
Filename:
MIME Type:
Creator:
Ken Moffat
Created:
2018-05-11 04:25:46 UTC
Size:
9.56 KB
patch
obsolete
>diff -Naur preff4/encode/encode_lavc.c b/encode/encode_lavc.c >--- preff4/encode/encode_lavc.c 2018-05-11 04:53:07.894550223 +0100 >+++ b/encode/encode_lavc.c 2018-05-11 02:13:17.064378090 +0100 >@@ -240,7 +240,7 @@ > vframe_list_t *vframe) > { > avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf, >- PIX_FMT_YUV420P, >+ AV_PIX_FMT_YUV420P, > pd->ff_vcontext.width, pd->ff_vcontext.height); > } > >@@ -254,7 +254,7 @@ > IMG_YUV_DEFAULT, > pd->ff_vcontext.width, pd->ff_vcontext.height); > avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, >- PIX_FMT_YUV422P, >+ AV_PIX_FMT_YUV422P, > pd->ff_vcontext.width, pd->ff_vcontext.height); > ac_imgconvert(src, IMG_YUV_DEFAULT, > pd->ff_venc_frame.data, IMG_YUV422P, >@@ -270,7 +270,7 @@ > IMG_YUV422P, > pd->ff_vcontext.width, pd->ff_vcontext.height); > avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, >- PIX_FMT_YUV420P, >+ AV_PIX_FMT_YUV420P, > pd->ff_vcontext.width, pd->ff_vcontext.height); > ac_imgconvert(src, IMG_YUV422P, > pd->ff_venc_frame.data, IMG_YUV420P, >@@ -292,7 +292,7 @@ > vframe_list_t *vframe) > { > avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf, >- PIX_FMT_YUV420P, >+ AV_PIX_FMT_YUV420P, > pd->ff_vcontext.width, pd->ff_vcontext.height); > ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT, > pd->ff_venc_frame.data, IMG_YUV420P, >@@ -622,15 +622,15 @@ > } else { > pd->tc_pix_fmt = TC_CODEC_YUV420P; > pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) >- ? PIX_FMT_YUVJ420P >- : PIX_FMT_YUV420P; >+ ? AV_PIX_FMT_YUVJ420P >+ : AV_PIX_FMT_YUV420P; > pd->pre_encode_video = pre_encode_video_yuv420p; > } > break; > case CODEC_YUV422: > pd->tc_pix_fmt = TC_CODEC_YUV422P; > pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) >- ? PIX_FMT_YUVJ422P >+ ? AV_PIX_FMT_YUVJ422P > : PIX_FMT_YUV422P; > if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) { > pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv; >@@ -643,8 +643,8 @@ > pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) > ? PIX_FMT_YUV422P > : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) >- ? PIX_FMT_YUVJ420P >- : PIX_FMT_YUV420P; >+ ? AV_PIX_FMT_YUVJ420P >+ : AV_PIX_FMT_YUV420P; > pd->pre_encode_video = pre_encode_video_rgb24; > break; > default: >diff -Naur preff4/export/export_ffmpeg.c b/export/export_ffmpeg.c >--- preff4/export/export_ffmpeg.c 2018-05-11 04:53:07.895550223 +0100 >+++ b/export/export_ffmpeg.c 2018-05-11 02:13:56.796369789 +0100 >@@ -490,7 +490,7 @@ > lavc_venc_frame = avcodec_alloc_frame(); > > lavc_convert_frame= avcodec_alloc_frame(); >- size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); >+ size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height); > enc_buffer = tc_malloc(size); > > if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) { >@@ -1118,7 +1118,7 @@ > lavc_venc_context->prediction_method = lavc_param_prediction_method; > > if(is_huffyuv) >- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; >+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; > else > { > switch(pix_fmt) >@@ -1127,18 +1127,18 @@ > case CODEC_RGB: > { > if(is_mjpeg) >- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P; >+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P; > else >- lavc_venc_context->pix_fmt = PIX_FMT_YUV420P; >+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P; > break; > } > > case CODEC_YUV422: > { > if(is_mjpeg) >- lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P; >+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P; > else >- lavc_venc_context->pix_fmt = PIX_FMT_YUV422P; >+ lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P; > break; > } > >@@ -1623,7 +1623,7 @@ > YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT, > lavc_venc_context->width, lavc_venc_context->height); > avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, >- PIX_FMT_YUV422P, lavc_venc_context->width, >+ AV_PIX_FMT_YUV422P, lavc_venc_context->width, > lavc_venc_context->height); > /* FIXME: can't use tcv_convert (see decode_lavc.c) */ > ac_imgconvert(src, IMG_YUV_DEFAULT, >@@ -1653,7 +1653,7 @@ > lavc_venc_context->width, > lavc_venc_context->height); > avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, >- PIX_FMT_YUV420P, lavc_venc_context->width, >+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, > lavc_venc_context->height); > ac_imgconvert(src, IMG_YUV422P, > lavc_venc_frame->data, IMG_YUV420P, >@@ -1664,7 +1664,7 @@ > > case CODEC_RGB: > avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer, >- PIX_FMT_YUV420P, lavc_venc_context->width, >+ AV_PIX_FMT_YUV420P, lavc_venc_context->width, > lavc_venc_context->height); > ac_imgconvert(¶m->buffer, IMG_RGB_DEFAULT, > lavc_venc_frame->data, IMG_YUV420P, >diff -Naur preff4/import/decode_lavc.c b/import/decode_lavc.c >--- preff4/import/decode_lavc.c 2018-05-11 04:53:07.896550223 +0100 >+++ b/import/decode_lavc.c 2018-05-11 04:24:48.017865052 +0100 >@@ -327,8 +327,8 @@ > > // Convert avcodec image to the requested YUV or RGB format > switch (lavc_dec_context->pix_fmt) { >- case PIX_FMT_YUVJ420P: >- case PIX_FMT_YUV420P: >+ case AV_PIX_FMT_YUVJ420P: >+ case AV_PIX_FMT_YUV420P: > // Remove "dead space" at right edge of planes, if any > if (picture.linesize[0] != lavc_dec_context->width) { > int y; >@@ -352,7 +352,7 @@ > pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, > lavc_dec_context->width, lavc_dec_context->height); > break; >- case PIX_FMT_YUV411P: >+ case AV_PIX_FMT_YUV411P: > if (picture.linesize[0] != lavc_dec_context->width) { > int y; > for (y = 0; y < lavc_dec_context->height; y++) { >@@ -371,8 +371,8 @@ > pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, > lavc_dec_context->width, lavc_dec_context->height); > break; >- case PIX_FMT_YUVJ422P: >- case PIX_FMT_YUV422P: >+ case AV_PIX_FMT_YUVJ422P: >+ case AV_PIX_FMT_YUV422P: > if (picture.linesize[0] != lavc_dec_context->width) { > int y; > for (y = 0; y < lavc_dec_context->height; y++) { >@@ -391,8 +391,8 @@ > pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT, > lavc_dec_context->width, lavc_dec_context->height); > break; >- case PIX_FMT_YUVJ444P: >- case PIX_FMT_YUV444P: >+ case AV_PIX_FMT_YUVJ444P: >+ case AV_PIX_FMT_YUV444P: > if (picture.linesize[0] != lavc_dec_context->width) { > int y; > for (y = 0; y < lavc_dec_context->height; y++) { >diff -Naur preff4/import/import_ffmpeg.c b/import/import_ffmpeg.c >--- preff4/import/import_ffmpeg.c 2018-05-11 04:53:07.896550223 +0100 >+++ b/import/import_ffmpeg.c 2018-05-11 04:24:29.601868136 +0100 >@@ -661,8 +661,8 @@ > > // Convert avcodec image to our internal YUV or RGB format > switch (lavc_dec_context->pix_fmt) { >- case PIX_FMT_YUVJ420P: >- case PIX_FMT_YUV420P: >+ case AV_PIX_FMT_YUVJ420P: >+ case AV_PIX_FMT_YUV420P: > src_fmt = IMG_YUV420P; > YUV_INIT_PLANES(src_planes, frame, src_fmt, > lavc_dec_context->width, lavc_dec_context->height); >@@ -693,7 +693,7 @@ > } > break; > >- case PIX_FMT_YUV411P: >+ case AV_PIX_FMT_YUV411P: > src_fmt = IMG_YUV411P; > YUV_INIT_PLANES(src_planes, frame, src_fmt, > lavc_dec_context->width, lavc_dec_context->height); >@@ -721,8 +721,8 @@ > } > break; > >- case PIX_FMT_YUVJ422P: >- case PIX_FMT_YUV422P: >+ case AV_PIX_FMT_YUVJ422P: >+ case AV_PIX_FMT_YUV422P: > src_fmt = IMG_YUV422P; > YUV_INIT_PLANES(src_planes, frame, src_fmt, > lavc_dec_context->width, lavc_dec_context->height); >@@ -750,8 +750,8 @@ > } > break; > >- case PIX_FMT_YUVJ444P: >- case PIX_FMT_YUV444P: >+ case AV_PIX_FMT_YUVJ444P: >+ case AV_PIX_FMT_YUV444P: > src_fmt = IMG_YUV444P; > YUV_INIT_PLANES(src_planes, frame, src_fmt, > lavc_dec_context->width, lavc_dec_context->height);
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=530778">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 655440
: 530778
