Commit Graph

28 Commits

Author SHA1 Message Date
Michael Niedermayer
ffb5a0d533 Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'
* commit '85770f2a2651497861ed938efcd0df3696ff5e45':
  AVOptions: make default_val a union, as proposed in AVOption2.
  Move ff_dynarray_add to lavu and make it public.
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  options: simplify av_find_opt by using av_next_option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01 00:26:05 +02:00
Anton Khirnov
85770f2a26 AVOptions: make default_val a union, as proposed in AVOption2.
This breaks API and ABI.
2011-04-30 08:34:16 +02:00
Anton Khirnov
4a7a1b7def lavf: use designated initializers for AVClasses. 2011-04-29 11:39:34 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
Ronald S. Bultje
0f86fcabdf spdifenc.c: fix compile because of missing include avio_internal.h. 2011-02-21 15:49:24 -05:00
Anton Khirnov
0ac8e2bf2b avio: make put_nbyte internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 14:25:17 -05:00
Anton Khirnov
77eb5504d3 avio: avio: avio_ prefixes for put_* functions
In the name of consistency:
put_byte           -> avio_w8
put_<type>         -> avio_w<type>
put_buffer         -> avio_write

put_nbyte will be made private
put_tag will be merged with avio_put_str

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 14:25:15 -05:00
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
Anssi Hannula
6c60fcf89a spdifenc: set flag AVFMT_NOTIMESTAMPS
There are no timestamps in IEC 61937.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-16 23:59:38 +01:00
Janne Grunau
ec25f83bd9 spdifenc: update 482d98f69b to the latest patch
"spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI"
2011-02-16 09:51:27 +01:00
Anssi Hannula
57f2c9aed9 spdifenc: fix byte order on big-endian systems
There is a check for HAVE_BIGENDIAN when outputting the IEC 61937
stream. On big-endian systems the payload data is not byteswapped,
causing in effect the outputted payload data to be in a different byte
order on big-endian than on little-endian systems.

However, the IEC 61937 preamble (and the final odd byte if present) is
always outputted in the same byte order. This means that on big-endian
systems the headers have a different byte order than the payload,
preventing useful use of the output.

Fix that by outputting the data in a format suitable for sending to an
audio device in S16LE format by default. Output as big-endian (S16BE)
is added as an AVOption. This makes the muxer output the same on all
archs by default.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-13 15:16:55 +01:00
Anssi Hannula
482d98f69b spdifenc: IEC 61937 encapsulation of DTS-HD for HDMI
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-13 15:16:39 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
Anssi Hannula
febd72be65 Use new function put_nbyte() to speed up padding.
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-02 10:46:50 +00:00
Carl Eugen Hoyos
548b97a66a Cosmetics: Re-indent after last commit.
Originally committed as revision 26161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 23:43:25 +00:00
Anssi Hannula
cc6c0c7b52 Do not add the preamble if the DTS stream is already padded, like DTS in
wav. In that case, DTS can be transmitted through S/PDIF without
the IEC 61937 headers.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 23:42:27 +00:00
Anssi Hannula
d8e481bb86 s/IEC958/IEC 61937 - IEC958 is a lower level format.
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 18:48:32 +00:00
Anssi Hannula
836132ec43 Fix wrong bitstream mode for AC-3.
Noticed by CrystalP from XBMC.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 16:48:40 +00:00
Anssi Hannula
a4c8e0a82b Improve error return values.
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 16:42:14 +00:00
Anssi Hannula
977903521e Always encapsulate DTS in big-endian format, at least some receivers
require that.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 16:34:47 +00:00
Anssi Hannula
e5e932e8b0 Add Anssi and myself to the authors in doxygen.
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 16:30:07 +00:00
Carl Eugen Hoyos
25a08596d3 Add copyright notices for the E-AC3 and TrueHD parts of the muxer.
Originally committed as revision 25835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-27 18:10:20 +00:00
Anssi Hannula
323e3f8b6c IEC 61937 encapsulation of TrueHD for HDMI passthrough.
This works at least for some people testing it.

Patch by Anssi Hannula, anssi d hannula a iki fi

Originally committed as revision 25834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-27 18:08:01 +00:00
Carl Eugen Hoyos
4b6bfbe2b7 100l: Fix crash in SPDIF muxer.
Originally committed as revision 25762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-17 23:23:25 +00:00
Carl Eugen Hoyos
909865fdbe Add support for IEC 61937 ("SPDIF") encapsulation for E-AC-3.
Only works via HDMI.

Patch by Anssi Hannula (anssi d hannula a iki d fi), based on some work
by myself.

Originally committed as revision 25760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-17 12:22:59 +00:00
Anssi Hannula
8079d2ec08 Move code to be used by the IEC 61937 demuxer from spifenc.c into common
files spdif.h and spdif.c.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-10 00:04:12 +00:00
Anssi Hannula
8cceef1681 Rename spdif.c as spdifenc,c to prepare for future spdif demuxer.
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 25713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-09 23:57:02 +00:00