Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ffmpeg options #270

Merged
merged 2 commits into from
Aug 8, 2022
Merged

fix ffmpeg options #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8392376
fix ffmpeg options
canaancuiyan Aug 3, 2022
c29dadd
Merge branch 'dev' into ffmpeg_options
zhangxiaojingCAN Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions package/ffmpeg_canaan/0032-buildroot-ffmpeg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
Index: b/libavcodec/libk510_h264.c
===================================================================
--- a/libavcodec/libk510_h264.c
+++ b/libavcodec/libk510_h264.c
@@ -177,9 +177,9 @@ static av_cold int k510_h264_encode_init
Cfg.MaxQP = 51;//from SliceQP to 51
Cfg.roiCtrlMode = ROI_QP_TABLE_NONE;
Cfg.encDblkCfg.disable_deblocking_filter_idc = 0;
- Cfg.encDblkCfg.slice_beta_offset_div2 = 1;
- Cfg.encDblkCfg.slice_alpha_c0_offset_div2 = 1;
- Cfg.entropyMode = ENTROPY_MODE_CAVLC;
+ Cfg.encDblkCfg.slice_beta_offset_div2 = 1;
+ Cfg.encDblkCfg.slice_alpha_c0_offset_div2 = 1;
+ Cfg.entropyMode = ENTROPY_MODE_CAVLC;
Cfg.sliceSplitCfg.bSplitEnable = false;

printf("Encoder Settings:\n");
@@ -421,10 +421,10 @@ static const AVOption options[] =
{ "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AVC_MAIN }, 0, 0, FLAGS, "profile_flags" },
{ "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = AVC_HIGH }, 0, 0, FLAGS, "profile_flags" },
{ "level", "Specify level", OFFSET(level), AV_OPT_TYPE_INT, {.i64 = 42}, 10, 42, FLAGS, "level_flags"},
- { "ar", "Set aspect ratio", OFFSET(ar), AV_OPT_TYPE_INT, {.i64 = ASPECT_RATIO_AUTO}, ASPECT_RATIO_AUTO, ASPECT_RATIO_16_9, FLAGS, "profile_flags"},
- { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_AUTO }, 0, 0, FLAGS, "profile_flags" },
- { "4:3", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_4_3 }, 0, 0, FLAGS, "profile_flags" },
- { "16:9", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_16_9 }, 0, 0, FLAGS, "profile_flags" },
+ { "ar", "Set aspect ratio", OFFSET(ar), AV_OPT_TYPE_INT, {.i64 = ASPECT_RATIO_AUTO}, ASPECT_RATIO_AUTO, ASPECT_RATIO_16_9, FLAGS, "ar_flags"},
+ { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_AUTO }, 0, 0, FLAGS, "ar_flags" },
+ { "4:3", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_4_3 }, 0, 0, FLAGS, "ar_flags" },
+ { "16:9", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_16_9 }, 0, 0, FLAGS, "ar_flags" },
{ "framesToEncode", "set the libk510_h264 framesToEncode", OFFSET(framesToEncode), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
{NULL}
};
Index: b/libavcodec/libk510_jpeg.c
===================================================================
--- a/libavcodec/libk510_jpeg.c
+++ b/libavcodec/libk510_jpeg.c
@@ -141,9 +141,9 @@ static av_cold int k510_jpeg_encode_init
Cfg.MaxQP = 51;//from SliceQP to 51
Cfg.roiCtrlMode = ROI_QP_TABLE_NONE;
Cfg.encDblkCfg.disable_deblocking_filter_idc = 0;
- Cfg.encDblkCfg.slice_beta_offset_div2 = 1;
- Cfg.encDblkCfg.slice_alpha_c0_offset_div2 = 1;
- Cfg.entropyMode = ENTROPY_MODE_CAVLC;
+ Cfg.encDblkCfg.slice_beta_offset_div2 = 1;
+ Cfg.encDblkCfg.slice_alpha_c0_offset_div2 = 1;
+ Cfg.entropyMode = ENTROPY_MODE_CAVLC;
Cfg.sliceSplitCfg.bSplitEnable = false;

printf("Encoder Settings:\n");
@@ -312,10 +312,10 @@ static const AVOption options[] =
{ "b", "Set video bitrate", OFFSET(bit_rate), AV_OPT_TYPE_INT, {.i64 = 4000000}, 0, 100000000, FLAGS },
{ "ch", "Set encode channel ", OFFSET(channel), AV_OPT_TYPE_INT, {.i64 = 0}, 0, (VENC_MAX_CHANNELS-1), FLAGS },
{ "maxrate", "Maximum bitrate. (0=ignore)", OFFSET(maxrate), AV_OPT_TYPE_INT, {.i64 = 4000000}, 0, 100000000, FLAGS },
- { "ar", "Set aspect ratio", OFFSET(ar), AV_OPT_TYPE_INT, {.i64 = ASPECT_RATIO_AUTO}, ASPECT_RATIO_AUTO, ASPECT_RATIO_16_9, FLAGS, "profile_flags"},
- { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_AUTO }, 0, 0, FLAGS, "profile_flags" },
- { "4:3", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_4_3 }, 0, 0, FLAGS, "profile_flags" },
- { "16:9", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_16_9 }, 0, 0, FLAGS, "profile_flags" },
+ { "ar", "Set aspect ratio", OFFSET(ar), AV_OPT_TYPE_INT, {.i64 = ASPECT_RATIO_AUTO}, ASPECT_RATIO_AUTO, ASPECT_RATIO_16_9, FLAGS, "ar_flags"},
+ { "auto", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_AUTO }, 0, 0, FLAGS, "ar_flags" },
+ { "4:3", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_4_3 }, 0, 0, FLAGS, "ar_flags" },
+ { "16:9", "", 0, AV_OPT_TYPE_CONST, { .i64 = ASPECT_RATIO_16_9 }, 0, 0, FLAGS, "ar_flags" },
{NULL}
};