Now with cosmetics and two new defines.
---
libavcodec/j2kenc.c | 16 ++++++++--------
libavcodec/jpeg2000.h | 4 ++++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index 82ad3284b5..4d5022db26 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -1812,16 +1812,16 @@ static const AVOption options[] = {
{ "tile_width", "Tile Width", OFFSET(tile_width),
AV_OPT_TYPE_INT, { .i64 = 256 }, 1, 1<<30, VE, },
{ "tile_height", "Tile Height", OFFSET(tile_height),
AV_OPT_TYPE_INT, { .i64 = 256 }, 1, 1<<30, VE, },
{ "pred", "DWT Type", OFFSET(pred),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, "pred"
},
- { "dwt97int", NULL, 0,
AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "pred"
},
- { "dwt53", NULL, 0,
AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "pred"
},
+ { "dwt97int", NULL, 0,
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_DWT97INT}, INT_MIN, INT_MAX, VE,
"pred" },
+ { "dwt53", NULL, 0,
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_DWT53 }, INT_MIN, INT_MAX, VE,
"pred" },
{ "sop", "SOP marker", OFFSET(sop),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, },
{ "eph", "EPH marker", OFFSET(eph),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, },
- { "prog", "Progression Order", OFFSET(prog),
AV_OPT_TYPE_INT, { .i64 = 0 }, JPEG2000_PGOD_LRCP,
JPEG2000_PGOD_CPRL, VE, "prog" },
- { "lrcp", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP }, 0, 0,
VE, "prog" },
- { "rlcp", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP }, 0, 0,
VE, "prog" },
- { "rpcl", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL }, 0, 0,
VE, "prog" },
- { "pcrl", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL }, 0, 0,
VE, "prog" },
- { "cprl", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL }, 0, 0,
VE, "prog" },
+ { "prog", "Progression Order", OFFSET(prog),
AV_OPT_TYPE_INT, { .i64 = 0 }, JPEG2000_PGOD_LRCP,
JPEG2000_PGOD_CPRL, VE, "prog" },
+ { "lrcp", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP}, 0, 0, VE,
"prog" },
+ { "rlcp", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP}, 0, 0, VE,
"prog" },
+ { "rpcl", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL}, 0, 0, VE,
"prog" },
+ { "pcrl", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL}, 0, 0, VE,
"prog" },
+ { "cprl", NULL, OFFSET(prog),
AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL}, 0, 0, VE,
"prog" },
{ "layer_rates", "Layer Rates", OFFSET(lr_str),
AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE },
{ NULL }
};
diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h
index 612832c872..1a37f0bbbe 100644
--- a/libavcodec/jpeg2000.h
+++ b/libavcodec/jpeg2000.h
@@ -111,6 +111,10 @@ enum Jpeg2000Quantsty { // quantization style
#define JPEG2000_CSTY_SOP 0x02 // SOP marker present
#define JPEG2000_CSTY_EPH 0x04 // EPH marker present
+// Lossy and lossless DWTs
+#define JPEG2000_DWT97INT 0x00 // lossy DWT
+#define JPEG2000_DWT53 0x01 // lossless DWT
+
// Progression orders
#define JPEG2000_PGOD_LRCP 0x00 // Layer-resolution
level-component-position progression
#define JPEG2000_PGOD_RLCP 0x01 // Resolution
level-layer-component-position progression
--
2.30.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
