August 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep/keycodes.h
by reimar 13 Feb '14

13 Feb '14

Author: reimar Date: Thu Mar 14 20:59:35 2013 New Revision: 35961 Log: Add support for binding any key in UTF-8 range. X11 part is a bit hackish since we need to use setlocale to get desired behaviour for XLookupString. Modified: trunk/Changelog trunk/input/input.c trunk/libvo/x11_common.c trunk/osdep/getch2.c trunk/osdep/keycodes.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/Changelog Thu Mar 14 20:59:35 2013 (r35961) @@ -13,6 +13,7 @@ MPlayer better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. + * Support binding keys corresponding to non-ASCII characters. 1.1: "We gave up on 1.0" Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/input/input.c Thu Mar 14 20:59:35 2013 (r35961) @@ -38,6 +38,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" +#include "libavutil/common.h" #include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" @@ -1474,6 +1475,7 @@ mp_input_get_key_name(int key) { int mp_input_get_key_from_name(const char *name) { + uint32_t utf8 = 0; int i,ret = 0,len = strlen(name); if(len == 1) { // Direct key code ret = (unsigned char)name[0]; @@ -1486,6 +1488,10 @@ mp_input_get_key_from_name(const char *n return key_names[i].key; } + GET_UTF8(utf8, (uint8_t)*name++, return -1;) + if (*name == 0 && utf8 < KEY_BASE) + return utf8; + return -1; } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/libvo/x11_common.c Thu Mar 14 20:59:35 2013 (r35961) @@ -21,6 +21,7 @@ #include <math.h> #include <inttypes.h> #include <limits.h> +#include <locale.h> #include "config.h" #include "mp_msg.h" @@ -427,6 +428,9 @@ int vo_init(void) return 1; // already called } + // Required so that XLookupString returns UTF-8 + if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n"); XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(mDisplayName); @@ -810,11 +814,22 @@ static int check_resize(void) return rc; } +static int to_utf8(const uint8_t *in) +{ + uint32_t v = 0; + GET_UTF8(v, *in++, goto err;) + if (*in || v >= KEY_BASE) + goto err; + return v; +err: + return 0; +} + int vo_x11_check_events(Display * mydisplay) { int ret = 0; XEvent Event; - char buf[100]; + uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; @@ -852,7 +867,7 @@ int vo_x11_check_events(Display * mydisp case KeyPress: case KeyRelease: { - int key; + int key, utf8; #ifdef CONFIG_GUI if ( use_gui ) { break; } @@ -863,6 +878,8 @@ int vo_x11_check_events(Display * mydisp key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + utf8 = to_utf8(buf); + if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { ctrl_state = Event.type == KeyPress; mplayer_put_key(KEY_CTRL | @@ -880,7 +897,8 @@ int vo_x11_check_events(Display * mydisp (ctrl_state ? MP_KEY_DOWN : 0)); } if (!vo_x11_putkey_ext(keySym)) { - vo_x11_putkey(key); + if (utf8) mplayer_put_key(utf8); + else vo_x11_putkey(key); } ret |= VO_EVENT_KEYPRESS; } Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/getch2.c Thu Mar 14 20:59:35 2013 (r35961) @@ -60,6 +60,7 @@ #include "mp_fifo.h" #include "keycodes.h" #include "getch2.h" +#include "libavutil/common.h" #ifdef HAVE_TERMIOS static struct termios tio_orig; @@ -201,6 +202,14 @@ void getch2(void) len = 2; } code = KEY_ENTER; + } else if (code >= 0xc0) { + uint32_t utf8 = 0; + i = 0; + GET_UTF8(utf8, (i < getch2_len ? getch2_buf[i++] : 0), goto not_utf8;) + if (utf8 < KEY_BASE) { + code = utf8; + len = i; + } } } else if (getch2_len > 1) { @@ -262,6 +271,7 @@ void getch2(void) } } } + not_utf8: found: getch2_len -= len; for (i = 0; i < getch2_len; i++) Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/keycodes.h Thu Mar 14 20:59:35 2013 (r35961) @@ -23,7 +23,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -#define KEY_BASE 0x100 +#define KEY_BASE 0x1000000 enum { KEY_TAB = 9, @@ -76,7 +76,7 @@ enum { KEY_VOLUME_DOWN, KEY_MUTE, /* Special internal/virtual keys */ - KEY_CLOSE_WIN = 0x1000, + KEY_CLOSE_WIN = KEY_BASE + 0x1000, }; /* Control keys short name */

3 10

r36437 - trunk/libmpdemux/aviheader.c
by reimar 31 Aug '13

31 Aug '13

Author: reimar Date: Sat Aug 31 08:49:56 2013 New Revision: 36437 Log: avidemux: try reading ODML index if the default one is uselessly small. Fixes Bugzilla #2150. Modified: trunk/libmpdemux/aviheader.c Modified: trunk/libmpdemux/aviheader.c ============================================================================== --- trunk/libmpdemux/aviheader.c Fri Aug 30 21:41:38 2013 (r36436) +++ trunk/libmpdemux/aviheader.c Sat Aug 31 08:49:56 2013 (r36437) @@ -461,7 +461,11 @@ while(1){ } -if (priv->suidx_size > 0 && priv->idx_size == 0) { +// Some files contain a dummy non-odml index. +// Ignore an index smaller than some arbitrary size. +// Some Canon cameras recording in MJPEG do this +// (encoder software identifier CanonMVI06). +if (priv->suidx_size > 0 && priv->idx_size < 4) { /* * No NEWAVIINDEX, but we got an OpenDML index. */

1 0

r36436 - trunk/libmpcodecs/ad_libmad.c
by reimar 30 Aug '13

30 Aug '13

Author: reimar Date: Fri Aug 30 21:41:38 2013 New Revision: 36436 Log: libmad: try decoding buffered data after EOF. Fixes bugzilla #2152. Modified: trunk/libmpcodecs/ad_libmad.c Modified: trunk/libmpcodecs/ad_libmad.c ============================================================================== --- trunk/libmpcodecs/ad_libmad.c Fri Aug 30 21:41:37 2013 (r36435) +++ trunk/libmpcodecs/ad_libmad.c Fri Aug 30 21:41:38 2013 (r36436) @@ -67,11 +67,7 @@ static int preinit(sh_audio_t *sh){ static int read_frame(sh_audio_t *sh){ mad_decoder_t *this = sh->context; - int len; -while((len=demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len], - sh->a_in_buffer_size-sh->a_in_buffer_len))>0){ - sh->a_in_buffer_len+=len; while(1){ int ret; mad_stream_buffer (&this->stream, sh->a_in_buffer, sh->a_in_buffer_len); @@ -84,8 +80,12 @@ while((len=demux_read_data(sh->ds,&sh->a } if (ret == 0) return 1; // OK!!! // error! try to resync! - if(this->stream.error==MAD_ERROR_BUFLEN) break; - } + if(this->stream.error==MAD_ERROR_BUFLEN) { + int len=demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len], + sh->a_in_buffer_size-sh->a_in_buffer_len); + if (len <= 0) break; + sh->a_in_buffer_len+=len; + } } mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Cannot sync MAD frame\n"); return 0;

1 0

r36435 - trunk/libmpcodecs/ad_libmad.c
by reimar 30 Aug '13

30 Aug '13

Author: reimar Date: Fri Aug 30 21:41:37 2013 New Revision: 36435 Log: ad_libmad: simplify code a bit. Modified: trunk/libmpcodecs/ad_libmad.c Modified: trunk/libmpcodecs/ad_libmad.c ============================================================================== --- trunk/libmpcodecs/ad_libmad.c Fri Aug 30 21:25:11 2013 (r36434) +++ trunk/libmpcodecs/ad_libmad.c Fri Aug 30 21:41:37 2013 (r36435) @@ -77,11 +77,10 @@ while((len=demux_read_data(sh->ds,&sh->a mad_stream_buffer (&this->stream, sh->a_in_buffer, sh->a_in_buffer_len); ret=mad_frame_decode (&this->frame, &this->stream); if (this->stream.next_frame) { - int num_bytes = - (char*)sh->a_in_buffer+sh->a_in_buffer_len - (char*)this->stream.next_frame; - memmove(sh->a_in_buffer, this->stream.next_frame, num_bytes); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"libmad: %d bytes processed\n",sh->a_in_buffer_len-num_bytes); - sh->a_in_buffer_len = num_bytes; + unsigned processed = this->stream.next_frame - (uint8_t *)sh->a_in_buffer; + sh->a_in_buffer_len -= processed; + memmove(sh->a_in_buffer, this->stream.next_frame, sh->a_in_buffer_len); + mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"libmad: %d bytes processed\n",processed); } if (ret == 0) return 1; // OK!!! // error! try to resync!

1 0

r36434 - trunk/av_helpers.c
by reimar 30 Aug '13

30 Aug '13

Author: reimar Date: Fri Aug 30 21:25:11 2013 New Revision: 36434 Log: Fix channel reordering for ac3_fixed encoder. Modified: trunk/av_helpers.c Modified: trunk/av_helpers.c ============================================================================== --- trunk/av_helpers.c Sun Aug 25 19:57:25 2013 (r36433) +++ trunk/av_helpers.c Fri Aug 30 21:25:11 2013 (r36434) @@ -120,13 +120,13 @@ int lavc_encode_audio(AVCodecContext *ct void *orig_src = src; int bps = av_get_bytes_per_sample(ctx->sample_fmt); int planar = ctx->channels > 1 && av_sample_fmt_is_planar(ctx->sample_fmt); + int isac3 = ctx->codec->id == AV_CODEC_ID_AC3; int n; int got; AVPacket pkt; AVFrame *frame = avcodec_alloc_frame(); if ((ctx->channels == 6 || ctx->channels == 5) && - (!strcmp(ctx->codec->name,"ac3") || !strcmp(ctx->codec->name,"libfaac"))) { - int isac3 = !strcmp(ctx->codec->name,"ac3"); + (isac3 || !strcmp(ctx->codec->name,"libfaac"))) { reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, isac3 ? AF_CHANNEL_LAYOUT_LAVC_DEFAULT : AF_CHANNEL_LAYOUT_AAC_DEFAULT, ctx->channels,

1 0

r36433 - in trunk: mencoder.c mplayer.c stream/stream.h stream/stream_bluray.c
by reimar 25 Aug '13

25 Aug '13

Author: reimar Date: Sun Aug 25 19:57:25 2013 New Revision: 36433 Log: Support -alang and -slang for bluray:// Modified: trunk/mencoder.c trunk/mplayer.c trunk/stream/stream.h trunk/stream/stream_bluray.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sun Aug 25 19:23:22 2013 (r36432) +++ trunk/mencoder.c Sun Aug 25 19:57:25 2013 (r36433) @@ -671,6 +671,13 @@ if(stream->type==STREAMTYPE_BD){ if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=bd_sid_from_lang(stream,dvdsub_lang); } +#ifdef CONFIG_LIBBLURAY +if(stream->type==STREAMTYPE_BLURAY){ + if(audio_lang && audio_id==-1) audio_id=bluray_id_from_lang(stream,stream_ctrl_audio,audio_lang); + if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=bluray_id_from_lang(stream,stream_ctrl_sub,dvdsub_lang); +} +#endif + #ifdef CONFIG_DVDREAD if(stream->type==STREAMTYPE_DVD){ if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Aug 25 19:23:22 2013 (r36432) +++ trunk/mplayer.c Sun Aug 25 19:57:25 2013 (r36433) @@ -3312,6 +3312,15 @@ play_next_file: dvdsub_id = bd_sid_from_lang(mpctx->stream, dvdsub_lang); } +#ifdef CONFIG_LIBBLURAY + if (mpctx->stream->type == STREAMTYPE_BLURAY) { + if (audio_lang && audio_id == -1) + audio_id = bluray_id_from_lang(mpctx->stream, stream_ctrl_audio, audio_lang); + if (dvdsub_lang && dvdsub_id == -1) + dvdsub_id = bluray_id_from_lang(mpctx->stream, stream_ctrl_sub, dvdsub_lang); + } +#endif + #ifdef CONFIG_DVDREAD if (mpctx->stream->type == STREAMTYPE_DVD) { current_module = "dvd lang->id"; Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Sun Aug 25 19:23:22 2013 (r36432) +++ trunk/stream/stream.h Sun Aug 25 19:57:25 2013 (r36433) @@ -396,6 +396,8 @@ typedef struct { int channels; } stream_language_t; +int bluray_id_from_lang(stream_t *s, enum stream_ctrl_type type, const char *lang); + int parse_chapter_range(const m_option_t *conf, const char *range); #endif /* MPLAYER_STREAM_H */ Modified: trunk/stream/stream_bluray.c ============================================================================== --- trunk/stream/stream_bluray.c Sun Aug 25 19:23:22 2013 (r36432) +++ trunk/stream/stream_bluray.c Sun Aug 25 19:57:25 2013 (r36433) @@ -105,6 +105,48 @@ static int bluray_stream_fill_buffer(str return bd_read(b->bd, buf, len); } +static BLURAY_TITLE_INFO *get_langs(const struct bluray_priv_s *b, enum stream_ctrl_type type, + const BLURAY_STREAM_INFO **si, int *count) +{ + BLURAY_TITLE_INFO *ti = bd_get_title_info(b->bd, b->current_title, b->current_angle); + *count = 0; + if (ti->clip_count) { + switch (type) { + case stream_ctrl_audio: + *count = ti->clips[0].audio_stream_count; + *si = ti->clips[0].audio_streams; + break; + case stream_ctrl_sub: + *count = ti->clips[0].pg_stream_count; + *si = ti->clips[0].pg_streams; + break; + } + if (*count > 0) + return ti; + } + *si = NULL; + bd_free_title_info(ti); + return NULL; +} + +int bluray_id_from_lang(stream_t *s, enum stream_ctrl_type type, const char *lang) +{ + struct bluray_priv_s *b = s->priv; + const BLURAY_STREAM_INFO *si; + int count; + BLURAY_TITLE_INFO *ti = get_langs(b, type, &si, &count); + while (count-- > 0) { + if (strstr(si->lang, lang)) { + bd_free_title_info(ti); + return si->pid; + } + si++; + } + if (ti) + bd_free_title_info(ti); + return -1; +} + static int bluray_stream_control(stream_t *s, int cmd, void *arg) { struct bluray_priv_s *b = s->priv; @@ -196,31 +238,20 @@ static int bluray_stream_control(stream_ case STREAM_CTRL_GET_LANG: { struct stream_lang_req *req = arg; - BLURAY_TITLE_INFO *ti = bd_get_title_info(b->bd, b->current_title, b->current_angle); - if (ti->clip_count) { - BLURAY_STREAM_INFO *si = NULL; - int count = 0; - switch (req->type) { - case stream_ctrl_audio: - count = ti->clips[0].audio_stream_count; - si = ti->clips[0].audio_streams; - break; - case stream_ctrl_sub: - count = ti->clips[0].pg_stream_count; - si = ti->clips[0].pg_streams; - break; - } - while (count-- > 0) { - if (si->pid == req->id) { - memcpy(req->buf, si->lang, 4); - req->buf[4] = 0; - bd_free_title_info(ti); - return STREAM_OK; - } - si++; + const BLURAY_STREAM_INFO *si; + int count; + BLURAY_TITLE_INFO *ti = get_langs(b, req->type, &si, &count); + while (count-- > 0) { + if (si->pid == req->id) { + memcpy(req->buf, si->lang, 4); + req->buf[4] = 0; + bd_free_title_info(ti); + return STREAM_OK; } + si++; } - bd_free_title_info(ti); + if (ti) + bd_free_title_info(ti); return STREAM_ERROR; }

1 0

r36432 - trunk/command.c
by reimar 25 Aug '13

25 Aug '13

Author: reimar Date: Sun Aug 25 19:23:22 2013 New Revision: 36432 Log: Fix disabling subtitles by switching through them. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Aug 25 13:30:45 2013 (r36431) +++ trunk/command.c Sun Aug 25 19:23:22 2013 (r36432) @@ -1552,6 +1552,7 @@ static int mp_property_sub(m_option_t *p if (d_sub->id > -2) reset_spu = 1; d_sub->id = -2; + d_sub->sh = NULL; } #ifdef CONFIG_ASS ass_track = 0;

1 0

r36431 - in trunk: av_helpers.c libaf/af_lavcac3enc.c libmpcodecs/ae_lavc.c
by reimar 25 Aug '13

25 Aug '13

Author: reimar Date: Sun Aug 25 13:30:45 2013 New Revision: 36431 Log: Quick an inefficient hack to enable planar encoding. Should fix bugzilla #2094. Modified: trunk/av_helpers.c trunk/libaf/af_lavcac3enc.c trunk/libmpcodecs/ae_lavc.c Modified: trunk/av_helpers.c ============================================================================== --- trunk/av_helpers.c Sun Aug 25 13:30:43 2013 (r36430) +++ trunk/av_helpers.c Sun Aug 25 13:30:45 2013 (r36431) @@ -117,11 +117,13 @@ void init_avformat(void) int lavc_encode_audio(AVCodecContext *ctx, void *src, int src_len, void *dst, int dst_len) { + void *orig_src = src; int bps = av_get_bytes_per_sample(ctx->sample_fmt); + int planar = ctx->channels > 1 && av_sample_fmt_is_planar(ctx->sample_fmt); int n; int got; AVPacket pkt; - AVFrame frame; + AVFrame *frame = avcodec_alloc_frame(); if ((ctx->channels == 6 || ctx->channels == 5) && (!strcmp(ctx->codec->name,"ac3") || !strcmp(ctx->codec->name,"libfaac"))) { int isac3 = !strcmp(ctx->codec->name,"ac3"); @@ -132,10 +134,27 @@ int lavc_encode_audio(AVCodecContext *ct } pkt.data = dst; pkt.size = dst_len; - frame.data[0] = src; - frame.linesize[0] = src_len / ctx->channels; - frame.nb_samples = frame.linesize[0] / bps; - n = avcodec_encode_audio2(ctx, &pkt, &frame, &got); + frame->nb_samples = src_len / ctx->channels / bps; + if (planar) { + // TODO: this is horribly inefficient. + int ch; + src = av_mallocz(src_len); + for (ch = 0; ch < ctx->channels; ch++) { + uint8_t *tmps = (uint8_t *)orig_src + ch*bps; + uint8_t *tmpd = (uint8_t *)src + ch*src_len/ctx->channels; + int s; + for (s = 0; s < frame->nb_samples; s++) { + memcpy(tmpd, tmps, bps); + tmps += ctx->channels * bps; + tmpd += bps; + } + } + } + n = avcodec_fill_audio_frame(frame, ctx->channels, ctx->sample_fmt, src, src_len, 1); + if (n < 0) return 0; + n = avcodec_encode_audio2(ctx, &pkt, frame, &got); + avcodec_free_frame(&frame); + if (planar) av_free(src); if (n < 0) return n; return got ? pkt.size : 0; } Modified: trunk/libaf/af_lavcac3enc.c ============================================================================== --- trunk/libaf/af_lavcac3enc.c Sun Aug 25 13:30:43 2013 (r36430) +++ trunk/libaf/af_lavcac3enc.c Sun Aug 25 13:30:45 2013 (r36431) @@ -106,7 +106,7 @@ static int control(struct af_instance_s // Put sample parameters s->lavc_actx->channels = af->data->nch; s->lavc_actx->sample_rate = af->data->rate; - s->lavc_actx->sample_fmt = AV_SAMPLE_FMT_S16; + s->lavc_actx->sample_fmt = AV_SAMPLE_FMT_S16P; s->lavc_actx->bit_rate = bit_rate; if(avcodec_open2(s->lavc_actx, s->lavc_acodec, NULL) < 0) { Modified: trunk/libmpcodecs/ae_lavc.c ============================================================================== --- trunk/libmpcodecs/ae_lavc.c Sun Aug 25 13:30:43 2013 (r36430) +++ trunk/libmpcodecs/ae_lavc.c Sun Aug 25 13:30:45 2013 (r36431) @@ -181,13 +181,13 @@ int mpae_init_lavc(audio_encoder_t *enco const enum AVSampleFormat *fmts; lavc_actx->sample_fmt = lavc_acodec->sample_fmts[0]; // fallback to first format for (fmts = lavc_acodec->sample_fmts; *fmts != AV_SAMPLE_FMT_NONE; fmts++) { - if (samplefmt2affmt(*fmts) == encoder->params.sample_format) { // preferred format found + if (samplefmt2affmt(av_get_packed_sample_fmt(*fmts)) == encoder->params.sample_format) { // preferred format found lavc_actx->sample_fmt = *fmts; break; } } } - encoder->input_format = samplefmt2affmt(lavc_actx->sample_fmt); + encoder->input_format = samplefmt2affmt(av_get_packed_sample_fmt(lavc_actx->sample_fmt)); if (encoder->input_format == AF_FORMAT_UNKNOWN) { mp_msg(MSGT_MENCODER,MSGL_ERR, "Audio encoder requires unknown or unsupported input format\n"); return 0;

1 0

r36430 - in trunk: av_helpers.c av_helpers.h libaf/af_lavcac3enc.c libmpcodecs/ae_lavc.c
by reimar 25 Aug '13

25 Aug '13

Author: reimar Date: Sun Aug 25 13:30:43 2013 New Revision: 36430 Log: Extract audio encoding code into a separate helper function. Modified: trunk/av_helpers.c trunk/av_helpers.h trunk/libaf/af_lavcac3enc.c trunk/libmpcodecs/ae_lavc.c Modified: trunk/av_helpers.c ============================================================================== --- trunk/av_helpers.c Sun Aug 25 13:30:42 2013 (r36429) +++ trunk/av_helpers.c Sun Aug 25 13:30:43 2013 (r36430) @@ -22,6 +22,7 @@ #include "libavformat/avformat.h" #include "mp_msg.h" #include "av_helpers.h" +#include "libaf/reorder_ch.h" int avcodec_initialized; int avformat_initialized; @@ -113,3 +114,28 @@ void init_avformat(void) av_log_set_callback(mp_msp_av_log_callback); } } + +int lavc_encode_audio(AVCodecContext *ctx, void *src, int src_len, void *dst, int dst_len) +{ + int bps = av_get_bytes_per_sample(ctx->sample_fmt); + int n; + int got; + AVPacket pkt; + AVFrame frame; + if ((ctx->channels == 6 || ctx->channels == 5) && + (!strcmp(ctx->codec->name,"ac3") || !strcmp(ctx->codec->name,"libfaac"))) { + int isac3 = !strcmp(ctx->codec->name,"ac3"); + reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + isac3 ? AF_CHANNEL_LAYOUT_LAVC_DEFAULT : AF_CHANNEL_LAYOUT_AAC_DEFAULT, + ctx->channels, + src_len / bps, bps); + } + pkt.data = dst; + pkt.size = dst_len; + frame.data[0] = src; + frame.linesize[0] = src_len / ctx->channels; + frame.nb_samples = frame.linesize[0] / bps; + n = avcodec_encode_audio2(ctx, &pkt, &frame, &got); + if (n < 0) return n; + return got ? pkt.size : 0; +} Modified: trunk/av_helpers.h ============================================================================== --- trunk/av_helpers.h Sun Aug 25 13:30:42 2013 (r36429) +++ trunk/av_helpers.h Sun Aug 25 13:30:43 2013 (r36430) @@ -21,7 +21,10 @@ #ifndef MPLAYER_AV_HELPERS_H #define MPLAYER_AV_HELPERS_H +struct AVCodecContext; + void init_avcodec(void); void init_avformat(void); +int lavc_encode_audio(struct AVCodecContext *ctx, void *src, int src_len, void *dst, int dst_len); #endif /* MPLAYER_AV_HELPERS_H */ Modified: trunk/libaf/af_lavcac3enc.c ============================================================================== --- trunk/libaf/af_lavcac3enc.c Sun Aug 25 13:30:42 2013 (r36429) +++ trunk/libaf/af_lavcac3enc.c Sun Aug 25 13:30:43 2013 (r36430) @@ -229,15 +229,10 @@ static af_data_t* play(struct af_instanc src += s->expect_len; left -= s->expect_len; } - if (c->nch >= 5) - reorder_channel_nch(in, - AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - AF_CHANNEL_LAYOUT_LAVC_DEFAULT, - c->nch, - s->expect_len / 2, 2); - len = avcodec_encode_audio(s->lavc_actx, dest, destsize, in); + len = lavc_encode_audio(s->lavc_actx, in, s->expect_len, dest, destsize); mp_msg(MSGT_AFILTER, MSGL_DBG2, "avcodec_encode_audio got %d, pending %d.\n", len, s->pending_len); + if (len < 0) len = 0; if (s->add_iec61937_header) { int bsmod = dest[5] & 0x7; Modified: trunk/libmpcodecs/ae_lavc.c ============================================================================== --- trunk/libmpcodecs/ae_lavc.c Sun Aug 25 13:30:42 2013 (r36429) +++ trunk/libmpcodecs/ae_lavc.c Sun Aug 25 13:30:43 2013 (r36430) @@ -118,20 +118,9 @@ static int bind_lavc(audio_encoder_t *en static int encode_lavc(audio_encoder_t *encoder, uint8_t *dest, void *src, int size, int max_size) { int n; - if ((encoder->params.channels == 6 || encoder->params.channels == 5) && - (!strcmp(lavc_acodec->name,"ac3") || - !strcmp(lavc_acodec->name,"libfaac"))) { - int isac3 = !strcmp(lavc_acodec->name,"ac3"); - int bps = av_get_bytes_per_sample(lavc_actx->sample_fmt); - reorder_channel_nch(src, AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - isac3 ? AF_CHANNEL_LAYOUT_LAVC_DEFAULT - : AF_CHANNEL_LAYOUT_AAC_DEFAULT, - encoder->params.channels, - size / bps, bps); - } - n = avcodec_encode_audio(lavc_actx, dest, size, src); - compressed_frame_size = n; - return n; + n = lavc_encode_audio(lavc_actx, src, size, dest, max_size); + compressed_frame_size = n < 0 ? 0 : n; + return compressed_frame_size; }

1 0

r36429 - trunk/libaf/af_lavcac3enc.c
by reimar 25 Aug '13

25 Aug '13

Author: reimar Date: Sun Aug 25 13:30:42 2013 New Revision: 36429 Log: lavcac3enc: avoid code duplication. Modified: trunk/libaf/af_lavcac3enc.c Modified: trunk/libaf/af_lavcac3enc.c ============================================================================== --- trunk/libaf/af_lavcac3enc.c Wed Aug 21 20:08:37 2013 (r36428) +++ trunk/libaf/af_lavcac3enc.c Sun Aug 25 13:30:42 2013 (r36429) @@ -202,6 +202,7 @@ static af_data_t* play(struct af_instanc while (left > 0) { + void *in = NULL; if (left + s->pending_len < s->expect_len) { memcpy(s->pending_data + s->pending_len, src, left); src += left; @@ -220,29 +221,21 @@ static af_data_t* play(struct af_instanc src += needs; left -= needs; } - - if (c->nch >= 5) - reorder_channel_nch(s->pending_data, - AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - AF_CHANNEL_LAYOUT_LAVC_DEFAULT, - c->nch, - s->expect_len / 2, 2); - - len = avcodec_encode_audio(s->lavc_actx, dest, destsize, - (void *)s->pending_data); + in = s->pending_data; s->pending_len = 0; } else { - if (c->nch >= 5) - reorder_channel_nch(src, - AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - AF_CHANNEL_LAYOUT_LAVC_DEFAULT, - c->nch, - s->expect_len / 2, 2); - len = avcodec_encode_audio(s->lavc_actx,dest,destsize,(void *)src); + in = src; src += s->expect_len; left -= s->expect_len; } + if (c->nch >= 5) + reorder_channel_nch(in, + AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, + AF_CHANNEL_LAYOUT_LAVC_DEFAULT, + c->nch, + s->expect_len / 2, 2); + len = avcodec_encode_audio(s->lavc_actx, dest, destsize, in); mp_msg(MSGT_AFILTER, MSGL_DBG2, "avcodec_encode_audio got %d, pending %d.\n", len, s->pending_len);

1 0