[FFmpeg-cvslog] fftools: Fix preset search pathes

[Nicolas Gaullier]

ffmpeg | branch: master | Nicolas Gaullier  | Thu 
Jun 30 12:40:35 2022 +0200| [d3cf7be5a4bd0c6bb80032c7697a8819563112c8] | 
committer: Timo Rothenpieler

fftools: Fix preset search pathes

regression since 13350e81fd

Fix looking for .ffmpeg subfolder in FFMPEG_DATADIR and inversely not in HOME.
Fix search order (documentation).

Signed-off-by: Timo Rothenpieler 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3cf7be5a4bd0c6bb80032c7697a8819563112c8
---

 fftools/cmdutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 69a6f54ea3..18e768b386 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -822,8 +822,8 @@ FILE *get_preset_file(char *filename, size_t filename_size,
 #endif
 char *env_home = getenv_utf8("HOME");
 char *env_ffmpeg_datadir = getenv_utf8("FFMPEG_DATADIR");
-const char *base[3] = { env_home,
-env_ffmpeg_datadir,
+const char *base[3] = { env_ffmpeg_datadir,
+env_home,   /* index=1(HOME) is special: search in 
a .ffmpeg subfolder */
 FFMPEG_DATADIR, };
 
 if (is_path) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/aacdec: fix parsing of dual mono files

[James Almer]

ffmpeg | branch: master | James Almer  | Tue Jul  5 12:49:29 
2022 -0300| [f9785a78da117be0c66f6d5d58ce7277c7029ae7] | committer: James Almer

avcodec/aacdec: fix parsing of dual mono files

Dual mono files report a channel count of 2 with each individual channel in its
own SCE, instead of both in a single CPE as is the case with standard stereo.
This commit handles this non default channel configuration scenario.

Fixes ticket #1614

Signed-off-by: James Almer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9785a78da117be0c66f6d5d58ce7277c7029ae7
---

 libavcodec/aacdec_template.c | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 0135cb35df..10fba3d3b2 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -701,14 +701,15 @@ static ChannelElement *get_che(AACContext *ac, int type, 
int elem_id)
 
 av_log(ac->avctx, AV_LOG_DEBUG, "stereo with SCE\n");
 
-if (set_default_channel_config(ac, ac->avctx, layout_map,
-   &layout_map_tags, 1) < 0)
-return NULL;
+layout_map_tags = 2;
+layout_map[0][0] = layout_map[1][0] = TYPE_SCE;
+layout_map[0][2] = layout_map[1][2] = AAC_CHANNEL_FRONT;
+layout_map[0][1] = 0;
+layout_map[1][1] = 1;
 if (output_configure(ac, layout_map, layout_map_tags,
  OC_TRIAL_FRAME, 1) < 0)
 return NULL;
 
-ac->oc[1].m4ac.chan_config = 1;
 if (ac->oc[1].m4ac.sbr)
 ac->oc[1].m4ac.ps = -1;
 }
@@ -786,8 +787,10 @@ static ChannelElement *get_che(AACContext *ac, int type, 
int elem_id)
 type == TYPE_CPE) {
 ac->tags_mapped++;
 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][0];
-} else if (ac->oc[1].m4ac.chan_config == 2) {
-return NULL;
+} else if (ac->tags_mapped == 1 && ac->oc[1].m4ac.chan_config == 2 &&
+type == TYPE_SCE) {
+ac->tags_mapped++;
+return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1];
 }
 case 1:
 if (!ac->tags_mapped && type == TYPE_SCE) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".