@@ -51,6 +51,7 @@ version next:

 - framestep filter

 - ffmpeg -shortest option is now per-output file

 - volume measurement filter

+- Ut Video encoder

 version 0.11:

@@ -142,7 +142,7 @@ int64_t parse_time_or_die(const char *context, const char *timestr,

 }

 void show_help_options(const OptionDef *options, const char *msg, int req_flags,

-                       int rej_flags)

+                       int rej_flags, int alt_flags)

 {

     const OptionDef *po;

     int first;

@@ -152,6 +152,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags,

         char buf[64];

         if (((po->flags & req_flags) != req_flags) ||

+            (alt_flags && !(po->flags & alt_flags)) ||

             (po->flags & rej_flags))

             continue;

@@ -178,9 +178,10 @@ typedef struct {

  * @param msg title of this group. Only printed if at least one option matches.

  * @param req_flags print only options which have all those flags set.

  * @param rej_flags don't print options which have any of those flags set.

+ * @param alt_flags print only options that have at least one of those flags set

  */

 void show_help_options(const OptionDef *options, const char *msg, int req_flags,

-                       int rej_flags);

+                       int rej_flags, int alt_flags);

 /**

  * Show help for all options with given flags in class and all its

@@ -666,7 +666,7 @@ following image formats are supported:

     @tab encoding supported through external library libtheora

 @item Tiertex Limited SEQ video  @tab     @tab  X

     @tab Codec used in DOS CD-ROM FlashBack game.

-@item Ut Video               @tab     @tab  X

+@item Ut Video               @tab  X  @tab  X

 @item v210 QuickTime uncompressed 4:2:2 10-bit     @tab  X  @tab  X

 @item v308 QuickTime uncompressed 4:4:4            @tab  X  @tab  X

 @item v408 QuickTime uncompressed 4:4:4:4          @tab  X  @tab  X

@@ -2141,32 +2141,68 @@ static int opt_filter_complex(const char *opt, const char *arg)

 void show_help_default(const char *opt, const char *arg)

 {

-    int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM;

+    /* per-file options have at least one of those set */

+    const int per_file = OPT_SPEC | OPT_OFFSET | OPT_FUNC2;

+    int show_advanced = 0, show_avoptions = 0;

+

+    if (opt) {

+        if (!strcmp(opt, "long"))

+            show_advanced = 1;

+        else if (!strcmp(opt, "full"))

+            show_advanced = show_avoptions = 1;

+        else

+            av_log(NULL, AV_LOG_ERROR, "Unknown help option '%s'.\n", opt);

+    }

     show_usage();

+

+    printf("Getting help:\n"

+           "    -h      -- print basic options\n"

+           "    -h long -- print more options\n"

+           "    -h full -- print all options (including all format and codec specific options, very long)\n"

+           "    See man %s for detailed description of the options.\n"

+           "\n", program_name);

+

     show_help_options(options, "Print help / information / capabilities:",

-                      OPT_EXIT, 0);

-    show_help_options(options, "Main options:",

-                      0, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE |

-                      OPT_EXIT);

-    show_help_options(options, "Advanced options:",

-                      OPT_EXPERT, OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE);

+                      OPT_EXIT, 0, 0);

+

+    show_help_options(options, "Global options (affect whole program "

+                      "instead of just one file:",

+                      0, per_file | OPT_EXIT | OPT_EXPERT, 0);

+    if (show_advanced)

+        show_help_options(options, "Advanced global options:", OPT_EXPERT,

+                          per_file | OPT_EXIT, 0);

+

+    show_help_options(options, "Per-file main options:", 0,

+                      OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE |

+                      OPT_EXIT, per_file);

+    if (show_advanced)

+        show_help_options(options, "Advanced per-file options:",

+                          OPT_EXPERT, OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, per_file);

+

     show_help_options(options, "Video options:",

-                      OPT_VIDEO, OPT_EXPERT | OPT_AUDIO);

-    show_help_options(options, "Advanced Video options:",

-                      OPT_EXPERT | OPT_VIDEO, OPT_AUDIO);

+                      OPT_VIDEO, OPT_EXPERT | OPT_AUDIO, 0);

+    if (show_advanced)

+        show_help_options(options, "Advanced Video options:",

+                          OPT_EXPERT | OPT_VIDEO, OPT_AUDIO, 0);

+

     show_help_options(options, "Audio options:",

-                      OPT_AUDIO, OPT_EXPERT | OPT_VIDEO);

-    show_help_options(options, "Advanced Audio options:",

-                      OPT_EXPERT | OPT_AUDIO, OPT_VIDEO);

+                      OPT_AUDIO, OPT_EXPERT | OPT_VIDEO, 0);

+    if (show_advanced)

+        show_help_options(options, "Advanced Audio options:",

+                          OPT_EXPERT | OPT_AUDIO, OPT_VIDEO, 0);

     show_help_options(options, "Subtitle options:",

-                      OPT_SUBTITLE, 0);

+                      OPT_SUBTITLE, 0, 0);

     printf("\n");

-    show_help_children(avcodec_get_class(), flags);

-    show_help_children(avformat_get_class(), flags);

-    show_help_children(sws_get_class(), flags);

-    show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);

-    show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM);

+

+    if (show_avoptions) {

+        int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM;

+        show_help_children(avcodec_get_class(), flags);

+        show_help_children(avformat_get_class(), flags);

+        show_help_children(sws_get_class(), flags);

+        show_help_children(swr_get_class(), AV_OPT_FLAG_AUDIO_PARAM);

+        show_help_children(avfilter_get_class(), AV_OPT_FLAG_FILTERING_PARAM);

+    }

 }

 void show_usage(void)

@@ -2229,15 +2265,15 @@ const OptionDef options[] = {

         "set the limit file size in bytes", "limit_size" },

     { "ss",             HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(start_time) },

         "set the start time offset", "time_off" },

-    { "itsoffset",      HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(input_ts_offset) },

+    { "itsoffset",      HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_EXPERT,{ .off = OFFSET(input_ts_offset) },

         "set the input ts offset", "time_off" },

-    { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC,             { .off = OFFSET(ts_scale) },

+    { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(ts_scale) },

         "set the input ts scale", "scale" },

     { "timestamp",      HAS_ARG | OPT_FUNC2,                         { .func2_arg = opt_recording_timestamp },

         "set the recording timestamp ('now' to set the current time)", "time" },

     { "metadata",       HAS_ARG | OPT_STRING | OPT_SPEC,             { .off = OFFSET(metadata) },

         "add metadata", "string=string" },

-    { "dframes",        HAS_ARG | OPT_FUNC2,                         { .func2_arg = opt_data_frames },

+    { "dframes",        HAS_ARG | OPT_FUNC2 | OPT_EXPERT,            { .func2_arg = opt_data_frames },

         "set the number of data frames to record", "number" },

     { "benchmark",      OPT_BOOL | OPT_EXPERT,                       { &do_benchmark },

         "add timings for benchmarking" },

@@ -2247,7 +2283,7 @@ const OptionDef options[] = {

       "write program-readable progress information", "url" },

     { "stdin",          OPT_BOOL | OPT_EXPERT,                       { &stdin_interaction },

       "enable or disable interaction on standard input" },

-    { "timelimit",      HAS_ARG,                                     { .func_arg = opt_timelimit },

+    { "timelimit",      HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_timelimit },

         "set max runtime in seconds", "limit" },

     { "dump",           OPT_BOOL | OPT_EXPERT,                       { &do_pkt_dump },

         "dump each input packet" },

@@ -2274,13 +2310,13 @@ const OptionDef options[] = {

         "timestamp discontinuity delta threshold", "threshold" },

     { "dts_error_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,       { &dts_error_threshold },

         "timestamp error delta threshold", "threshold" },

-    { "xerror",         OPT_BOOL,                                    { &exit_on_error },

+    { "xerror",         OPT_BOOL | OPT_EXPERT,                       { &exit_on_error },

         "exit on error", "error" },

     { "copyinkf",       OPT_BOOL | OPT_EXPERT | OPT_SPEC,            { .off = OFFSET(copy_initial_nonkeyframes) },

         "copy initial non-keyframes" },

     { "frames",         OPT_INT64 | HAS_ARG | OPT_SPEC,              { .off = OFFSET(max_frames) },

         "set the number of frames to record", "number" },

-    { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC,             { .off = OFFSET(codec_tags) },

+    { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(codec_tags) },

         "force codec tag/fourcc", "fourcc/tag" },

     { "q",              HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC,{ .off = OFFSET(qscale) },

         "use fixed quality scale (VBR)", "q" },

@@ -2294,9 +2330,9 @@ const OptionDef options[] = {

         "create a complex filtergraph", "graph_description" },

     { "stats",          OPT_BOOL,                                    { &print_stats },

         "print progress report during encoding", },

-    { "attach",         HAS_ARG | OPT_FUNC2,                         { .func2_arg = opt_attach },

+    { "attach",         HAS_ARG | OPT_FUNC2 | OPT_EXPERT,            { .func2_arg = opt_attach },

         "add an attachment to the output file", "filename" },

-    { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC,            { .off = OFFSET(dump_attachment) },

+    { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |OPT_EXPERT,{ .off = OFFSET(dump_attachment) },

         "extract an attachment into a file", "filename" },

     { "debug_ts",       OPT_BOOL | OPT_EXPERT,                       { &debug_ts },

         "print timestamp debugging info" },

@@ -2342,9 +2378,9 @@ const OptionDef options[] = {

         "rate control override for specific intervals", "override" },

     { "vcodec",       OPT_VIDEO | HAS_ARG  | OPT_FUNC2,                          { .func2_arg = opt_video_codec },

         "force video codec ('copy' to copy stream)", "codec" },

-    { "sameq",        OPT_VIDEO | OPT_BOOL,                                      { &same_quant },

+    { "sameq",        OPT_VIDEO | OPT_BOOL | OPT_EXPERT ,                        { &same_quant },

         "use same quantizer as source (implies VBR)" },

-    { "same_quant",   OPT_VIDEO | OPT_BOOL ,                                     { &same_quant },

+    { "same_quant",   OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &same_quant },

         "use same quantizer as source (implies VBR)" },

     { "timecode",     OPT_VIDEO | HAS_ARG | OPT_FUNC2,                           { .func2_arg = opt_timecode },

         "set initial TimeCode value.", "hh:mm:ss[:;.]ff" },

@@ -2431,7 +2467,7 @@ const OptionDef options[] = {

     { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_preload) },

         "set the initial demux-decode delay", "seconds" },

-    { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(bitstream_filters) },

+    { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT, { .off = OFFSET(bitstream_filters) },

         "A comma-separated list of bitstream filters", "bitstream_filters" },

     { "absf", HAS_ARG | OPT_AUDIO | OPT_EXPERT| OPT_FUNC2, { .func2_arg = opt_old2new },

         "deprecated", "audio bitstream_filters" },

@@ -2447,7 +2483,7 @@ const OptionDef options[] = {

     { "fpre", HAS_ARG | OPT_EXPERT| OPT_FUNC2, { .func2_arg = opt_preset },

         "set options from indicated preset file", "filename" },

     /* data codec support */

-    { "dcodec", HAS_ARG | OPT_DATA | OPT_FUNC2, { .func2_arg = opt_data_codec },

+    { "dcodec", HAS_ARG | OPT_DATA | OPT_FUNC2 | OPT_EXPERT, { .func2_arg = opt_data_codec },

         "force data codec ('copy' to copy stream)", "codec" },

     { "dn", OPT_BOOL | OPT_VIDEO | OPT_OFFSET, { .off = OFFSET(data_disable) },

         "disable data" },

@@ -3025,8 +3025,8 @@ void show_help_default(const char *opt, const char *arg)

 {

     av_log_set_callback(log_callback_help);

     show_usage();

-    show_help_options(options, "Main options:", 0, OPT_EXPERT);

-    show_help_options(options, "Advanced options:", OPT_EXPERT, 0);

+    show_help_options(options, "Main options:", 0, OPT_EXPERT, 0);

+    show_help_options(options, "Advanced options:", OPT_EXPERT, 0, 0);

     printf("\n");

     show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);

     show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);

@@ -2076,7 +2076,7 @@ void show_help_default(const char *opt, const char *arg)

 {

     av_log_set_callback(log_callback_help);

     show_usage();

-    show_help_options(options, "Main options:", 0, 0);

+    show_help_options(options, "Main options:", 0, 0, 0);

     printf("\n");

     show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);

@@ -4650,8 +4650,7 @@ void show_help_default(const char *opt, const char *arg)

     printf("usage: ffserver [options]\n"

            "Hyper fast multi format Audio/Video streaming server\n");

     printf("\n");

-    show_help_options(options, "Main options:", 0, 0);

-    return 0;

+    show_help_options(options, "Main options:", 0, 0, 0);

 }

 static const OptionDef options[] = {

@@ -432,7 +432,8 @@ OBJS-$(CONFIG_TTA_DECODER)             += tta.o

 OBJS-$(CONFIG_TWINVQ_DECODER)          += twinvq.o celp_math.o

 OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o

 OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o

-OBJS-$(CONFIG_UTVIDEO_DECODER)         += utvideodec.o

+OBJS-$(CONFIG_UTVIDEO_DECODER)         += utvideodec.o utvideo.o

+OBJS-$(CONFIG_UTVIDEO_ENCODER)         += utvideoenc.o utvideo.o

 OBJS-$(CONFIG_V210_DECODER)            += v210dec.o

 OBJS-$(CONFIG_V210_ENCODER)            += v210enc.o

 OBJS-$(CONFIG_V308_DECODER)            += v308dec.o

@@ -229,7 +229,7 @@ void avcodec_register_all(void)

     REGISTER_DECODER (TSCC2, tscc2);

     REGISTER_DECODER (TXD, txd);

     REGISTER_DECODER (ULTI, ulti);

-    REGISTER_DECODER (UTVIDEO, utvideo);

+    REGISTER_ENCDEC  (UTVIDEO, utvideo);

     REGISTER_ENCDEC  (V210,  v210);

     REGISTER_DECODER (V210X, v210x);

     REGISTER_ENCDEC  (V308, v308);

new file mode 100644

@@ -0,0 +1,39 @@

+/*

+ * Common Ut Video code

+ * Copyright (c) 2011 Konstantin Shishkov

+ *

+ * 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

+ */

+

+/**

+ * @file

+ * Common Ut Video code

+ */

+

+#include "utvideo.h"

+

+const int ff_ut_pred_order[5] = {

+    PRED_LEFT, PRED_MEDIAN, PRED_MEDIAN, PRED_NONE, PRED_GRADIENT

+};

+

+const int ff_ut_rgb_order[4]  = { 1, 2, 0, 3 }; // G, B, R, A

+

+int ff_ut_huff_cmp_len(const void *a, const void *b)

+{

+    const HuffEntry *aa = a, *bb = b;

+    return (aa->len - bb->len)*256 + aa->sym - bb->sym;

+}

new file mode 100644

@@ -0,0 +1,91 @@

+/*

+ * Common Ut Video header

+ * Copyright (c) 2011 Konstantin Shishkov

+ *

+ * 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_UTVIDEO_H

+#define AVCODEC_UTVIDEO_H

+

+/**

+ * @file

+ * Common Ut Video header

+ */

+

+#include "libavutil/common.h"

+#include "avcodec.h"

+#include "dsputil.h"

+

+enum {

+    PRED_NONE = 0,

+    PRED_LEFT,

+    PRED_GRADIENT,

+    PRED_MEDIAN,

+};

+

+enum {

+    COMP_NONE = 0,

+    COMP_HUFF,

+};

+

+/*

+ * "Original format" markers.

+ * Based on values gotten from the official VFW encoder.

+ * They are not used during decoding, but they do have

+ * an informative role on seeing what was input

+ * to the encoder.

+ */

+enum {

+    UTVIDEO_RGB  = MKTAG(0x00, 0x00, 0x01, 0x18),

+    UTVIDEO_RGBA = MKTAG(0x00, 0x00, 0x02, 0x18),

+    UTVIDEO_420  = MKTAG('Y', 'V', '1', '2'),

+    UTVIDEO_422  = MKTAG('Y', 'U', 'Y', '2'),

+};

+

+/* Mapping of libavcodec prediction modes to Ut Video's */

+extern const int ff_ut_pred_order[5];

+

+/* Order of RGB(A) planes in Ut Video */

+extern const int ff_ut_rgb_order[4];

+

+typedef struct UtvideoContext {

+    AVCodecContext *avctx;

+    AVFrame        pic;

+    DSPContext     dsp;

+

+    uint32_t frame_info_size, flags, frame_info;

+    int      planes;

+    int      slices;

+    int      compression;

+    int      interlaced;

+    int      frame_pred;

+

+    uint8_t *slice_bits, *slice_buffer;

+    int      slice_bits_size;

+} UtvideoContext;

+

+typedef struct HuffEntry {

+    uint8_t  sym;

+    uint8_t  len;

+    uint32_t code;

+} HuffEntry;

+

+/* Compare huffman tree nodes */

+int ff_ut_huff_cmp_len(const void *a, const void *b);

+

+#endif /* AVCODEC_UTVIDEO_H */

@@ -32,40 +32,7 @@

 #include "get_bits.h"

 #include "dsputil.h"

 #include "thread.h"

-

-enum {

-    PRED_NONE = 0,

-    PRED_LEFT,

-    PRED_GRADIENT,

-    PRED_MEDIAN,

-};

-

-typedef struct UtvideoContext {

-    AVCodecContext *avctx;

-    AVFrame pic;

-    DSPContext dsp;

-

-    uint32_t frame_info_size, flags, frame_info;

-    int planes;

-    int slices;

-    int compression;

-    int interlaced;

-    int frame_pred;

-

-    uint8_t *slice_bits;

-    int slice_bits_size;

-} UtvideoContext;

-

-typedef struct HuffEntry {

-    uint8_t sym;

-    uint8_t len;

-} HuffEntry;

-

-static int huff_cmp(const void *a, const void *b)

-{

-    const HuffEntry *aa = a, *bb = b;

-    return (aa->len - bb->len)*256 + aa->sym - bb->sym;

-}

+#include "utvideo.h"

 static int build_huff(const uint8_t *src, VLC *vlc, int *fsym)

 {

@@ -82,7 +49,7 @@ static int build_huff(const uint8_t *src, VLC *vlc, int *fsym)

         he[i].sym = i;

         he[i].len = *src++;

     }

-    qsort(he, 256, sizeof(*he), huff_cmp);

+    qsort(he, 256, sizeof(*he), ff_ut_huff_cmp_len);

     if (!he[0].len) {

         *fsym = he[0].sym;

@@ -216,8 +183,6 @@ fail:

     return AVERROR_INVALIDDATA;

 }

-static const int rgb_order[4] = { 1, 2, 0, 3 };

-

 static void restore_rgb_planes(uint8_t *src, int step, int stride, int width,

                                int height)

 {

@@ -432,20 +397,22 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,

     case PIX_FMT_RGB24:

     case PIX_FMT_RGBA:

         for (i = 0; i < c->planes; i++) {

-            ret = decode_plane(c, i, c->pic.data[0] + rgb_order[i], c->planes,

-                               c->pic.linesize[0], avctx->width, avctx->height,

-                               plane_start[i], c->frame_pred == PRED_LEFT);

+            ret = decode_plane(c, i, c->pic.data[0] + ff_ut_rgb_order[i],

+                               c->planes, c->pic.linesize[0], avctx->width,

+                               avctx->height, plane_start[i],

+                               c->frame_pred == PRED_LEFT);

             if (ret)

                 return ret;

             if (c->frame_pred == PRED_MEDIAN) {

                 if (!c->interlaced) {

-                    restore_median(c->pic.data[0] + rgb_order[i], c->planes,

-                                   c->pic.linesize[0], avctx->width,

+                    restore_median(c->pic.data[0] + ff_ut_rgb_order[i],

+                                   c->planes, c->pic.linesize[0], avctx->width,

                                    avctx->height, c->slices, 0);

                 } else {

-                    restore_median_il(c->pic.data[0] + rgb_order[i], c->planes,

-                                      c->pic.linesize[0], avctx->width,

-                                      avctx->height, c->slices, 0);

+                    restore_median_il(c->pic.data[0] + ff_ut_rgb_order[i],

+                                      c->planes, c->pic.linesize[0],

+                                      avctx->width, avctx->height, c->slices,

+                                      0);

                 }

             }

         }

new file mode 100644

@@ -0,0 +1,735 @@

+/*

+ * Ut Video encoder

+ * Copyright (c) 2012 Jan Ekström

+ *

+ * 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

+ */

+

+/**

+ * @file

+ * Ut Video encoder

+ */

+

+#include "libavutil/intreadwrite.h"

+#include "avcodec.h"

+#include "internal.h"

+#include "bytestream.h"

+#include "put_bits.h"

+#include "dsputil.h"

+#include "mathops.h"

+#include "utvideo.h"

+

+/* Compare huffentry symbols */

+static int huff_cmp_sym(const void *a, const void *b)

+{

+    const HuffEntry *aa = a, *bb = b;

+    return aa->sym - bb->sym;

+}

+

+static av_cold int utvideo_encode_close(AVCodecContext *avctx)

+{

+    UtvideoContext *c = avctx->priv_data;

+

+    av_freep(&avctx->coded_frame);

+    av_freep(&c->slice_bits);

+    av_freep(&c->slice_buffer);

+

+    return 0;

+}

+

+static av_cold int utvideo_encode_init(AVCodecContext *avctx)

+{

+    UtvideoContext *c = avctx->priv_data;

+

+    uint32_t original_format;

+

+    c->avctx           = avctx;

+    c->frame_info_size = 4;

+

+    switch (avctx->pix_fmt) {

+    case PIX_FMT_RGB24:

+        c->planes        = 3;

+        avctx->codec_tag = MKTAG('U', 'L', 'R', 'G');

+        original_format  = UTVIDEO_RGB;

+        break;

+    case PIX_FMT_RGBA:

+        c->planes        = 4;

+        avctx->codec_tag = MKTAG('U', 'L', 'R', 'A');

+        original_format  = UTVIDEO_RGBA;

+        break;

+    case PIX_FMT_YUV420P:

+        if (avctx->width & 1 || avctx->height & 1) {

+            av_log(avctx, AV_LOG_ERROR,

+                   "4:2:0 video requires even width and height.\n");

+            return AVERROR_INVALIDDATA;

+        }

+        c->planes        = 3;

+        avctx->codec_tag = MKTAG('U', 'L', 'Y', '0');

+        original_format  = UTVIDEO_420;

+        break;

+    case PIX_FMT_YUV422P:

+        if (avctx->width & 1) {

+            av_log(avctx, AV_LOG_ERROR,

+                   "4:2:2 video requires even width.\n");

+            return AVERROR_INVALIDDATA;

+        }

+        c->planes        = 3;

+        avctx->codec_tag = MKTAG('U', 'L', 'Y', '2');

+        original_format  = UTVIDEO_422;

+        break;

+    default:

+        av_log(avctx, AV_LOG_ERROR, "Unknown pixel format: %d\n",

+               avctx->pix_fmt);

+        return AVERROR_INVALIDDATA;

+    }

+

+    ff_dsputil_init(&c->dsp, avctx);

+

+    /* Check the prediction method, and error out if unsupported */

+    if (avctx->prediction_method < 0 || avctx->prediction_method > 4) {

+        av_log(avctx, AV_LOG_WARNING,

+               "Prediction method %d is not supported in Ut Video.\n",

+               avctx->prediction_method);

+        return AVERROR_OPTION_NOT_FOUND;

+    }

+

+    if (avctx->prediction_method == FF_PRED_PLANE) {

+        av_log(avctx, AV_LOG_ERROR,

+               "Plane prediction is not supported in Ut Video.\n");

+        return AVERROR_OPTION_NOT_FOUND;

+    }

+

+    /* Convert from libavcodec prediction type to Ut Video's */

+    c->frame_pred = ff_ut_pred_order[avctx->prediction_method];

+

+    if (c->frame_pred == PRED_GRADIENT) {

+        av_log(avctx, AV_LOG_ERROR, "Gradient prediction is not supported.\n");

+        return AVERROR_OPTION_NOT_FOUND;

+    }

+

+    avctx->coded_frame = avcodec_alloc_frame();

+

+    if (!avctx->coded_frame) {

+        av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n");

+        utvideo_encode_close(avctx);

+        return AVERROR(ENOMEM);

+    }

+

+    /* extradata size is 4 * 32bit */

+    avctx->extradata_size = 16;

+

+    avctx->extradata = av_mallocz(avctx->extradata_size +

+                                  FF_INPUT_BUFFER_PADDING_SIZE);

+

+    if (!avctx->extradata) {

+        av_log(avctx, AV_LOG_ERROR, "Could not allocate extradata.\n");

+        utvideo_encode_close(avctx);

+        return AVERROR(ENOMEM);

+    }

+

+    c->slice_buffer = av_malloc(avctx->width * avctx->height +

+                                FF_INPUT_BUFFER_PADDING_SIZE);

+

+    if (!c->slice_buffer) {

+        av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 1.\n");

+        utvideo_encode_close(avctx);

+        return AVERROR(ENOMEM);

+    }

+

+    /*

+     * Set the version of the encoder.

+     * Last byte is "implementation ID", which is

+     * obtained from the creator of the format.

+     * Libavcodec has been assigned with the ID 0xF0.

+     */

+    AV_WB32(avctx->extradata, MKTAG(1, 0, 0, 0xF0));

+

+    /*

+     * Set the "original format"

+     * Not used for anything during decoding.

+     */

+    AV_WL32(avctx->extradata + 4, original_format);

+

+    /* Write 4 as the 'frame info size' */

+    AV_WL32(avctx->extradata + 8, c->frame_info_size);

+

+    /*

+     * Set how many slices are going to be used.

+     * Set one slice for now.

+     */

+    c->slices = 1;

+

+    /* Set compression mode */

+    c->compression = COMP_HUFF;

+

+    /*

+     * Set the encoding flags:

+     * - Slice count minus 1

+     * - Interlaced encoding mode flag, set to zero for now.

+     * - Compression mode (none/huff)

+     * And write the flags.

+     */

+    c->flags  = (c->slices - 1) << 24;

+    c->flags |= 0 << 11; // bit field to signal interlaced encoding mode

+    c->flags |= c->compression;

+

+    AV_WL32(avctx->extradata + 12, c->flags);

+

+    return 0;

+}

+

+static void mangle_rgb_planes(uint8_t *src, int step, int stride, int width,

+                              int height)

+{

+    int i, j;

+    uint8_t r, g, b;

+

+    for (j = 0; j < height; j++) {

+        for (i = 0; i < width * step; i += step) {

+            r = src[i];

+            g = src[i + 1];

+            b = src[i + 2];

+

+            src[i]     = r - g + 0x80;

+            src[i + 2] = b - g + 0x80;

+        }

+        src += stride;

+    }

+}

+

+/* Write data to a plane, no prediction applied */

+static void write_plane(uint8_t *src, uint8_t *dst, int step, int stride,

+                        int width, int height)

+{

+    int i, j;

+

+    for (j = 0; j < height; j++) {

+        for (i = 0; i < width * step; i += step)

+            *dst++ = src[i];

+

+        src += stride;

+    }

+}

+

+/* Write data to a plane with left prediction */

+static void left_predict(uint8_t *src, uint8_t *dst, int step, int stride,

+                         int width, int height)

+{

+    int i, j;

+    uint8_t prev;

+

+    prev = 0x80; /* Set the initial value */

+    for (j = 0; j < height; j++) {

+        for (i = 0; i < width * step; i += step) {

+            *dst++ = src[i] - prev;

+            prev   = src[i];

+        }

+        src += stride;

+    }

+}

+

+/* Write data to a plane with median prediction */

+static void median_predict(uint8_t *src, uint8_t *dst, int step, int stride,

+                           int width, int height)

+{

+    int i, j;

+    int A, B, C;

+    uint8_t prev;

+

+    /* First line uses left neighbour prediction */

+    prev = 0x80; /* Set the initial value */

+    for (i = 0; i < width * step; i += step) {

+        *dst++ = src[i] - prev;

+        prev   = src[i];

+    }

+

+    if (height == 1)

+        return;

+

+    src += stride;

+

+    /*

+     * Second line uses top prediction for the first sample,

+     * and median for the rest.

+     */

+    C      = src[-stride];

+    *dst++ = src[0] - C;

+    A      = src[0];

+    for (i = step; i < width * step; i += step) {

+        B       = src[i - stride];

+        *dst++  = src[i] - mid_pred(A, B, (A + B - C) & 0xFF);

+        C       = B;

+        A       = src[i];

+    }

+

+    src += stride;

+

+    /* Rest of the coded part uses median prediction */

+    for (j = 2; j < height; j++) {

+        for (i = 0; i < width * step; i += step) {

+            B       = src[i - stride];

+            *dst++  = src[i] - mid_pred(A, B, (A + B - C) & 0xFF);

+            C       = B;

+            A       = src[i];

+        }

+        src += stride;

+    }

+}

+

+/* Count the usage of values in a plane */

+static void count_usage(uint8_t *src, int width,

+                        int height, uint32_t *counts)

+{

+    int i, j;

+

+    for (j = 0; j < height; j++) {

+        for (i = 0; i < width; i++) {

+            counts[src[i]]++;

+        }

+        src += width;

+    }

+}

+

+static uint32_t add_weights(uint32_t w1, uint32_t w2)

+{

+    uint32_t max = (w1 & 0xFF) > (w2 & 0xFF) ? (w1 & 0xFF) : (w2 & 0xFF);

+

+    return ((w1 & 0xFFFFFF00) + (w2 & 0xFFFFFF00)) | (1 + max);

+}

+

+static void up_heap(uint32_t val, uint32_t *heap, uint32_t *weights)

+{

+    uint32_t initial_val = heap[val];

+

+    while (weights[initial_val] < weights[heap[val >> 1]]) {

+        heap[val] = heap[val >> 1];

+        val     >>= 1;

+    }

+

+    heap[val] = initial_val;

+}

+

+static void down_heap(uint32_t nr_heap, uint32_t *heap, uint32_t *weights)

+{

+    uint32_t val = 1;

+    uint32_t val2;

+    uint32_t initial_val = heap[val];

+

+    while (1) {

+        val2 = val << 1;

+

+        if (val2 > nr_heap)

+            break;

+

+        if (val2 < nr_heap && weights[heap[val2 + 1]] < weights[heap[val2]])

+            val2++;

+

+        if (weights[initial_val] < weights[heap[val2]])

+            break;

+

+        heap[val] = heap[val2];

+

+        val = val2;

+    }

+

+    heap[val] = initial_val;

+}

+

+/* Calculate the huffman code lengths from value counts */

+static void calculate_code_lengths(uint8_t *lengths, uint32_t *counts)

+{

+    uint32_t nr_nodes, nr_heap, node1, node2;

+    int      i, j;

+    int32_t  k;

+

+    /* Heap and node entries start from 1 */

+    uint32_t weights[512];

+    uint32_t heap[512];

+    int32_t  parents[512];

+

+    /* Set initial weights */