diff mbox

[FFmpeg-devel,1/4] proresenc_nanatoliy: Rename a profile name with the correct one

Message ID 20181102193540.64694-1-vittorio.giovara@gmail.com
State Accepted
Commit febaa63b0f7f7ef7e80cfc5031e1d0982d9c74ea
Headers show

Commit Message

Vittorio Giovara Nov. 2, 2018, 7:35 p.m. UTC 
In all Apple documentation, this profile is called Prores 4444.
---
 libavcodec/proresenc_anatoliy.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Paul B Mahol Nov. 3, 2018, 2:15 p.m. UTC | #1 
On 11/2/18, Vittorio Giovara <vittorio.giovara@gmail.com> wrote:
> In all Apple documentation, this profile is called Prores 4444.
> ---
>  libavcodec/proresenc_anatoliy.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)


There is typo in log message, with that fixed patchset lgtm.
Vittorio Giovara Nov. 5, 2018, 6:10 p.m. UTC | #2 
On Sat, Nov 3, 2018 at 10:23 AM Paul B Mahol <onemda@gmail.com> wrote:

> On 11/2/18, Vittorio Giovara <vittorio.giovara@gmail.com> wrote:
> > In all Apple documentation, this profile is called Prores 4444.
> > ---
> >  libavcodec/proresenc_anatoliy.c | 16 ++++++++--------
> >  1 file changed, 8 insertions(+), 8 deletions(-)
>
>
> There is typo in log message, with that fixed patchset lgtm.
>

thanks, fixed and pushed
diff mbox

Patch

diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c
index 6b9ce4a59a..dbbf13f4c0 100644
--- a/libavcodec/proresenc_anatoliy.c
+++ b/libavcodec/proresenc_anatoliy.c
@@ -41,14 +41,14 @@ 
 #define FF_PROFILE_PRORES_LT        1
 #define FF_PROFILE_PRORES_STANDARD  2
 #define FF_PROFILE_PRORES_HQ        3
-#define FF_PROFILE_PRORES_444       4
+#define FF_PROFILE_PRORES_4444      4
 
 static const AVProfile profiles[] = {
     { FF_PROFILE_PRORES_PROXY,    "apco"},
     { FF_PROFILE_PRORES_LT,       "apcs"},
     { FF_PROFILE_PRORES_STANDARD, "apcn"},
     { FF_PROFILE_PRORES_HQ,       "apch"},
-    { FF_PROFILE_PRORES_444,      "ap4h"},
+    { FF_PROFILE_PRORES_4444,     "ap4h"},
     { FF_PROFILE_UNKNOWN }
 };
 
@@ -550,7 +550,7 @@  static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     bytestream_put_buffer(&buf, "fmpg", 4);
     bytestream_put_be16(&buf, avctx->width);
     bytestream_put_be16(&buf, avctx->height);
-    if (avctx->profile == FF_PROFILE_PRORES_444) {
+    if (avctx->profile == FF_PROFILE_PRORES_4444) {
         *buf++ = 0xC2; // 444, not interlaced
     } else {
         *buf++ = 0x82; // 422, not interlaced
@@ -605,13 +605,13 @@  static av_cold int prores_encode_init(AVCodecContext *avctx)
             av_log(avctx, AV_LOG_INFO,
                 "encoding with ProRes standard (apcn) profile\n");
         } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P10) {
-            avctx->profile = FF_PROFILE_PRORES_444;
+            avctx->profile = FF_PROFILE_PRORES_4444;
             av_log(avctx, AV_LOG_INFO,
-                   "encoding with ProRes 444 (ap4h) profile\n");
+                   "encoding with ProRes 4444 (ap4h) profile\n");
         }
 
     } else if (avctx->profile < FF_PROFILE_PRORES_PROXY
-            || avctx->profile > FF_PROFILE_PRORES_444) {
+            || avctx->profile > FF_PROFILE_PRORES_4444) {
         av_log(
                 avctx,
                 AV_LOG_ERROR,
@@ -622,13 +622,13 @@  static av_cold int prores_encode_init(AVCodecContext *avctx)
         av_log(avctx, AV_LOG_ERROR,
                "encoding with ProRes 444 (ap4h) profile, need YUV444P10 input\n");
         return AVERROR(EINVAL);
-    }  else if ((avctx->pix_fmt == AV_PIX_FMT_YUV444P10) && (avctx->profile < FF_PROFILE_PRORES_444)){
+    }  else if ((avctx->pix_fmt == AV_PIX_FMT_YUV444P10) && (avctx->profile < FF_PROFILE_PRORES_4444)){
         av_log(avctx, AV_LOG_ERROR,
                "encoding with ProRes Proxy/LT/422/422 HQ (apco, apcs, apcn, ap4h) profile, need YUV422P10 input\n");
         return AVERROR(EINVAL);
     }
 
-    if (avctx->profile < FF_PROFILE_PRORES_444) { /* 422 versions */
+    if (avctx->profile < FF_PROFILE_PRORES_4444) { /* 422 versions */
         ctx->is_422 = 1;
         if ((avctx->height & 0xf) || (avctx->width & 0xf)) {
             ctx->fill_y = av_malloc(4 * (DEFAULT_SLICE_MB_WIDTH << 8));