Changing AVM codec description #1726
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
y-guyon
requested changes
Nov 6, 2023
apps/avifenc.c
Outdated
| @@ -235,7 +235,7 @@ static void syntaxLong(void) | |||
| printf(" -g,--grid MxN : Encode a single-image grid AVIF with M cols & N rows. Either supply MxN identical W/H/D images, or a single\n"); | |||
| printf(" image that can be evenly split into the MxN grid and follow AVIF grid image restrictions. The grid will adopt\n"); | |||
| printf(" the color profile of the first image supplied.\n"); | |||
| printf(" -c,--codec C : AV1 codec to use (choose from versions list below)\n"); | |||
| printf(" -c,--codec C : AV1/AV2 codec to use (choose from versions list below)\n"); | |||
There was a problem hiding this comment.
AVIF_CODEC_AVM is an experimental feature, so I would avoid mentioning AV2 if AVIF_CODEC_AVM is OFF.
Suggestion:
printf(" -c,--codec C : codec to use (choose from versions list below)\n");
apps/avifenc.c
Outdated
| @@ -790,7 +790,7 @@ static avifBool avifGetBestCellSize(const char * dimensionStr, uint32_t numPixel | |||
|
|
|||
| // The maximum AV1 frame size is 65536 pixels inclusive. | |||
| if (*cellSize > 65536) { | |||
| fprintf(stderr, "ERROR: Cell size %u is bigger %s than the maximum AV1 frame size 65536.\n", *cellSize, dimensionStr); | |||
| fprintf(stderr, "ERROR: Cell size %u is bigger %s than the maximum AV1/AV2 frame size 65536.\n", *cellSize, dimensionStr); | |||
There was a problem hiding this comment.
Suggestion:
fprintf(stderr, "ERROR: Cell size %u is bigger %s than the maximum codec frame size 65536.\n", *cellSize, dimensionStr);| @@ -1207,7 +1213,6 @@ static avifBool avifEncodeImagesFixedQuality(const avifSettings * settings, | |||
| gainMapStr, | |||
| encoder->autoTiling ? "automatic tiling" : manualTilingStr, | |||
| settings->jobs); | |||
There was a problem hiding this comment.
Suggestion:
printf("Encoding with codec '%s' speed [%s], color quality [%d (%s)], alpha quality [%d (%s)]%s, %s, %d worker thread(s), please wait...\n",
codecName ? codecName : "none",
speedStr,
encoder->quality,
qualityString(encoder->quality),
encoder->qualityAlpha,
qualityString(encoder->qualityAlpha),
gainMapStr,
encoder->autoTiling ? "automatic tiling" : manualTilingStr,
settings->jobs);
apps/avifenc.c
Outdated
| @@ -1827,7 +1832,7 @@ MAIN() | |||
| } else { | |||
| const char * codecName = avifCodecName(settings.codecChoice, AVIF_CODEC_FLAG_CAN_ENCODE); | |||
| if (codecName == NULL) { | |||
| fprintf(stderr, "ERROR: AV1 Codec cannot encode: %s\n", arg); | |||
| fprintf(stderr, "ERROR: AV1/AV2 Codec cannot encode: %s\n", arg); | |||
There was a problem hiding this comment.
Suggestion:
fprintf(stderr, "ERROR: Codec %s is unrecognized, unavailable or can only decode\n", arg);
apps/avifenc.c
Outdated
Comment on lines
2521
to
2531
| if (settings.codecChoice == AVIF_CODEC_CHOICE_AOM) { | ||
| printf(" * Color AV1 total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.colorSizeBytes); | ||
| printf(" * Alpha AV1 total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.alphaSizeBytes); | ||
| if (byteSizes.gainMapSizeBytes > 0) { | ||
| printf(" * Gain Map AV1 total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.gainMapSizeBytes); | ||
| } | ||
| } | ||
| if (settings.codecChoice == AVIF_CODEC_CHOICE_AVM) { | ||
| printf(" * Color AV2 total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.colorSizeBytes); | ||
| printf(" * Alpha AV2 total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.alphaSizeBytes); | ||
| if (byteSizes.gainMapSizeBytes > 0) { | ||
| printf(" * Gain Map AV2 total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.gainMapSizeBytes); | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggestion:
printf(" * Coded color total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.colorSizeBytes);
printf(" * Coded alpha total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.alphaSizeBytes);
if (byteSizes.gainMapSizeBytes > 0) {
printf(" * Coded gain map total size: %" AVIF_FMT_ZU " bytes\n", byteSizes.gainMapSizeBytes);
}
|
Hi, can you please rebase and take the comments into account. Thx |
y-guyon
approved these changes
Jan 11, 2024
|
Thank you for rebasing. There was no notification so we forgot to check this pull request afterwards. I rebased it myself again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.