Commit Graph

122 Commits

Author SHA1 Message Date
Baptiste Coudurier
7d6096e42e Use ext sample from mpeg4audio config if set with AAC SBR
Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 22:31:31 +00:00
Stefano Sabatini
2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
Howard Chu
fc8fa007fb Implement librtmp seek support.
Implement flv_read_seek(), add a missing check on stream_index
and fix timestamp rounding in rtmp_read_seek().

Also add the flv_read_seek2() function, which is not enabled but is
useful as reference.
To actually implement flv_read_seek2() correctly, there would need to
be some corresponding av_url_read_fseek2() function to propagate the
timestamps down to the ByteIOContext and URLContext.

Patch by Howard Chu <hyc <at> highlandsun.com>.

See the thread:
Subject: [FFmpeg-devel] RTMP seek support
Date: 2010-03-28 23:35:02 GMT

Originally committed as revision 22904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-18 19:09:25 +00:00
Howard Chu
7e939205d9 Set audio bit rate.
Patch by Howard Chu, hyc highlandsun com

Originally committed as revision 22835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-11 12:21:30 +00:00
Howard Chu
527c2e6429 Fix flvdec start-of-frame.
Patch by Howard Chu hyc highlandsun com

Originally committed as revision 22757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 08:02:20 +00:00
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Baptiste Coudurier
fdf4662211 fetch flv duration from file if it is set to 0 in metadata
Originally committed as revision 21329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 19:41:24 +00:00
Michael Niedermayer
cc38e063be Revert flvdec.c part of r20836
Log:
	Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
	arrays of fixed length.
	Code from ffmbc with changes to adapt to our metadata API.
Reason: memleak & fix is not trivial

Originally committed as revision 20866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 15:59:19 +00:00
Daniel Verkamp
8e9efe4392 FLV 8-bit PCM is unsigned, not signed
Fixes issue #1569

Originally committed as revision 20853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 03:30:25 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped
arrays of fixed length.
Code from ffmbc with changes to adapt to our metadata API.

Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 20:27:29 +00:00
Daniel Verkamp
0aa6a518ad Add codec id for Flash screen codec v2 and hook it up in FLV demuxer
Originally committed as revision 20563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-20 19:16:42 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig.
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 20:24:23 +00:00
Michael Niedermayer
37e34df5a5 Check offset in flv_probe()
Originally committed as revision 19858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 14:56:09 +00:00
Martin Storsjö
b126dee964 Use all 32 bits of the timestamp when calculating flv duration.
At the moment, duration is mainly set from the metadata packet. If that is not
available, the fallback is checking the low 24 bits of the last packet. This is
not enough for files over 4,6 hours in length, so read all 32 bits instead.
patch by Martin Storsjö, martin martin st

Originally committed as revision 19791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 10:49:51 +00:00
Justin Ruggles
d2a47a578e Remove fake Speex header creation from FLV demuxer. Having it there was not the
correct solution to the problem.  A better solution might be possible later once
Speex is supported in muxers.

Originally committed as revision 19761 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-04 21:43:41 +00:00
Måns Rullgård
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 12:20:04 +00:00
Aurelien Jacobs
df2bd71aeb flvdec: expose metadata through the generic metadata API
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:54:37 +00:00
Aurelien Jacobs
09e54e1ff8 flvdec: re-enable metadata parsing
duration and videodatarate values are actually useful
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:49:33 +00:00
Aurelien Jacobs
8caa0f0651 flvdec: don't set format and codec context from metadata values
This has proven to be useless and even harmfull since r18460 (expect
for duration and videodatarate).
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-06 21:46:37 +00:00
Justin Ruggles
c1c206b343 flvdec: Build a Speex header during FLV demuxing using required and
default values. This is needed because FLV files with Speex do not
contain a Speex header, which is necessary for stream copy.

Originally committed as revision 19267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 22:10:53 +00:00
Art Clarke
e1d8d7bb4b Downgrade message log level (from AV_LOG_ERROR to AV_LOG_DEBUG) about
skipped metadata packet in FLV demuxer.

Patch by Art Clarke a${surname} At xuggle - com.

Originally committed as revision 19210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:14:59 +00:00
Michael Niedermayer
4eec260642 Remove unused variable from flv_read_metabody() found by CSA.
Originally committed as revision 18571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 17:42:41 +00:00
Michael Niedermayer
77daaf6748 Disable metadata reading. Yes, I would like to know what this code is good for
and this is the easiest way to. It would be a lot of messy code we can drop
if it is useless.
As a sideeffect this fixes issue977.

Originally committed as revision 18460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 04:01:03 +00:00
Michael Niedermayer
634b927f82 Do not fail on zero packets.
Originally committed as revision 18328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-03 15:32:31 +00:00
Baptiste Coudurier
fcb4228c86 skip empty data packets in flv, fix input.flv
Originally committed as revision 18306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 03:52:19 +00:00
Michael Niedermayer
ded0149948 Replace two 'return AVERROR(EAGAIN);' by continue. The latter are nicer
and the EAGAIN were just added as example not because they made sense.

Originally committed as revision 17783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 20:24:17 +00:00
Baptiste Coudurier
d2718187b9 parse aac extradata to fetch channels and sample rate, patch from Netgem
Originally committed as revision 17506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 23:54:50 +00:00
Peter Ross
0e9602ef93 FLV demuxer: return AVERROR_EOF upon detection of end of file.
Originally committed as revision 17457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 12:19:55 +00:00
Benoit Fouet
c102347088 Add a context to av_log() calls.
Originally committed as revision 17375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 16:09:34 +00:00
Stefan de Konink
9a354fe3f9 Implement the reading of the video bitrate of flv movies out of the meta data,
to have the total bitrate available in the avformat structures.
Patch by Stefan de Konink  stefan konink de

Originally committed as revision 16943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 16:05:50 +00:00
Michael Niedermayer
a308737bd6 Use EAGAIN return, primarely intended as example of EAGAIN useage.
Originally committed as revision 16719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-22 12:08:06 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Michael Niedermayer
2f3d7ea974 Fix detection of audio codec in K70707-ARIA229.flv.
Fixes issue760.

Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 20:56:30 +00:00
Baptiste Coudurier
ebd610557e set pts in flv demuxer
Originally committed as revision 15841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 02:56:34 +00:00
Andrew Wason
8ff8de73a4 Fix endless loop when opening corrupt FLV files (issue 699).
Patch by Andrew Wason, rectalogic A rectalogic D com

Originally committed as revision 15738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 23:49:04 +00:00
Baptiste Coudurier
7f8cd075e0 simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
Originally committed as revision 15687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 23:06:03 +00:00
Baptiste Coudurier
f96d0eef53 force sample rate to 16khz for speex in flv, fix speexaudio.flv
Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 18:36:26 +00:00
Pascal Massimino
4fe8a45240 fix for >2GB flv files
Originally committed as revision 15677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 16:46:43 +00:00
Alexander Wichers
88cb61bb0c 8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu
Originally committed as revision 15632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:08:55 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Baptiste Coudurier
ae58b54b3f skip empty flv data packets, fix issue #602
Originally committed as revision 15042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:10:34 +00:00
Baptiste Coudurier
3d9aecb0d7 factorize packet skip code
Originally committed as revision 15041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:07:01 +00:00
Baptiste Coudurier
6298eb810d simplify size handling code
Originally committed as revision 15040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:03:18 +00:00
Baptiste Coudurier
77b0443544 speex in flv demuxing
Originally committed as revision 15028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:06:35 +00:00
Baptiste Coudurier
22e7d9cc25 skip flv video info / command frame packets, fix issue #546
Originally committed as revision 14480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 02:26:40 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Baptiste Coudurier
04fd3e8134 aac and h264 in flv demuxing
Originally committed as revision 13439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 22:01:41 +00:00
Baptiste Coudurier
7ef94d221b in flv this field is dts finally
Originally committed as revision 13268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 21:51:33 +00:00
Baptiste Coudurier
19719bc631 flv use 32 bit pts
Originally committed as revision 13267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 21:47:30 +00:00