har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,406 Commits 2 Branches 401 Tags
Commit Graph

8856 Commits

Author SHA1 Message Date
Samuel Pitoiset
7be2a7d8ff rtmp: Factorize the code by adding handle_chunk_size 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 21:08:22 +03:00
Samuel Pitoiset
0ffd5161c4 rtmp: Factorize the code by adding handle_ping 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 21:08:20 +03:00
Samuel Pitoiset
912ecc9a19 rtmp: Factorize the code by adding handle_client_bw 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 21:08:18 +03:00
Samuel Pitoiset
9b498148ca rtmp: Factorize the code by adding handle_server_bw 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 21:08:09 +03:00
Samuel Pitoiset
758377a2b7 rtmp: Add a new option 'rtmp_pageurl' 
This option specifies the URL of the web page in which the media
was embedded.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:33:13 +03:00
Samuel Pitoiset
63ffa154e9 rtmp: Make the description of the rtmp_tcurl option more generic 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:33:10 +03:00
Jordi Ortiz
ecfff0e992 sctp: add port missing error message 
Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:31:16 +03:00
Jordi Ortiz
f9a9a14862 tcp: add port missing error message 
Without this patch a user a bit absent-minded may not notice that
the connection doesn't work because the port is missing.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-25 20:30:39 +03:00
Martin Storsjö
6a433fdba8 rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code 
Our implementation of RTMPE is heavily based on librtmp.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-24 18:13:26 +03:00
Samuel Pitoiset
f7bfb126cd rtmp: Move the CONFIG_ condition into the if conditions 
This makes sure these calls are removed by dead code elimination
even if optimization is disabled. This fixes building without
crypto libraries without optimization.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-24 15:54:10 +03:00
Diego Biurrun
6b80142144 build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled 
The ffrtmpcrypt protocol depends on external libraries, which are
also required to compile the header file.
 2012-07-24 00:21:39 +02:00
Adriano Pallavicino
999c63e4ca rtp: Only choose static payload types if the sample rate and channels are right 
If using a different sample rate or number of channels, use a dynamic
payload type instead, where the parameters are passed in the SDP.

G722 is a special case where the normal rules don't apply.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-24 00:42:58 +03:00
Clément Bœsch
61884b9d1b wav: init st to NULL to avoid a false-positive warning. 
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.

Fixes warning:
    libavformat/wav.c: In function ‘wav_read_header’:
    libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-23 11:34:08 -04:00
Samuel Pitoiset
08cd95e8a3 RTMPTE protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-23 16:32:09 +03:00
Samuel Pitoiset
acd554c103 RTMPE protocol support 
This adds two protocols, but one of them is an internal implementation
detail just used as an abstraction layer/generalization in the code. The
RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the
tcp:// protocol. This allows moving most of the lower level logic out
from the higher level generic rtmp code.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-23 16:32:07 +03:00
Samuel Pitoiset
0e31088b6c rtmp: Add ff_rtmp_calc_digest_pos() 
This function is used for calculating digest position for RTMP handshake
packets.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-23 16:32:05 +03:00
Samuel Pitoiset
3505d5574e rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-23 16:32:03 +03:00
Ronald S. Bultje
fd48721849 lavf: use conditional notation for default codec in muxer declarations. 
This removes the use of macro nesting in these code constructs, which
makes it easier to parse in pre-processors.
 2012-07-22 16:10:21 -07:00
Anton Khirnov
721113bed2 matroskadec: return more correct error code on read error. 2012-07-22 09:14:05 +02:00
Kostya Shishkov
1470ce21ce Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer 2012-07-22 08:43:12 +02:00
Mohamed Naufal Basheer
55c3a4f617 G.723.1 demuxer and decoder 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-07-22 07:58:54 +02:00
Ronald S. Bultje
5354a904fe rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro. 
This makes usage of the macro look more natural when
used with array entries.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-21 15:35:01 -04:00
Diego Biurrun
1cf6e7dd37 mpegenc: remove disabled code 2012-07-21 16:34:29 +02:00
Justin Ruggles
1749e12f45 cafdec: allow larger ALAC magic cookie 
It already skips any extra bytes at the end, and apparently there are some
samples in the wild with larger 'kuki' chunks.
 2012-07-19 20:14:29 -04:00
Justin Ruggles
3bab7cd128 avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxer 2012-07-19 13:26:45 -04:00
Justin Ruggles
c0196a14b9 caf: use int64_t for num_packets 
It is used to store a value read by avio_rb64().
 2012-07-19 13:26:45 -04:00
Justin Ruggles
f5a9c35f88 caf: fix 'pakt' chunk parsing 
according to the CAF specification:
"... the value for mChunkSize can be greater than the actual valid content
of the packet table chunk"
 2012-07-19 13:26:45 -04:00
Justin Ruggles
b0b77b9ca5 caf: support either old or new style ALAC magic kuki chunk 2012-07-19 13:26:45 -04:00
Diego Biurrun
7a249625fd os_support: K&R formatting cosmetics 2012-07-17 20:10:50 +02:00
Samuel Pitoiset
86991ce2dd RTMPTS protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 14:02:55 +03:00
Samuel Pitoiset
6aedabc9b6 RTMPS protocol support 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 13:53:33 +03:00
Samuel Pitoiset
775c4d3625 rtmp: Rename rtmphttp to ffrtmphttp 
The prefix makes it easier to distinguish the proper end-user
protocols from the internal ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-17 01:19:01 +03:00
Jordi Ortiz
08e087ccf7 rtmp: rtmp_parse_result() add case for video and audio packets to avoid undesired debug output. 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-07-16 13:45:15 +02:00
Diego Biurrun
20d569dd61 mpeg: remove disabled code 2012-07-16 00:15:21 +02:00
Martin Storsjö
9e4b04f8b9 network: Always use our version of gai_strerror on windows 
Even if linking directly to getaddrinfo, use our version of
gai_strerror instead of the system's version. Microsoft explicitly
documents that their version of gai_strerror is thread-unsafe.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-15 21:41:38 +03:00
Martin Storsjö
c98e2053f5 network: Undefine existing gai_strerror definitions 
This avoids warnings if there already exists a definition.

This is the case on windows, where the getaddrinfo isn't available
and linked to (and we use our fallbacks instead, which actually
try to use the proper getaddrinfo version if found at runtime),
but gai_strerror still exists as a define.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-15 21:41:28 +03:00
Martin Storsjö
2ca6e9bb47 network: Extend the fallback gai_strerror implementation to handle more error codes 
This is useful if a proper getaddrinfo is loaded dynamically on
windows, while using the fallback implementation of gai_strerror.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-15 21:21:59 +03:00
Diego Biurrun
47aed43990 build: Fix APE tag dependencies 2012-07-13 10:17:20 +02:00
Kostya Shishkov
5b7e3a195d MS Expression Encoder Screen decoder 2012-07-13 06:59:48 +02:00
Diego Biurrun
b7884ff7af build: Fix MP2 muxer dependencies 2012-07-12 10:45:21 +02:00
Diego Biurrun
d648de61e6 build: Add missing build rules for the ISMV muxer 2012-07-12 10:45:20 +02:00
Kostya Shishkov
781888da89 TechSmith Screen Codec 2 decoder 2012-07-11 07:29:05 +02:00
Jordi Ortiz
a8ad6ffafe rtsp: Add listen mode 
This makes the RTSP demuxer act as a server, listening for an
incoming connection.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 22:00:28 +03:00
Jordi Ortiz
6e71c1202b rtsp: Make rtsp_open_transport_ctx() non-static 
This is required for the upcoming RTSP listen mode.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:21:19 +03:00
Jordi Ortiz
6bbb362218 rtsp: Move rtsp_read_close 
This avoids having to add forward declarations in the following
RTSP listen mode commit.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:20:34 +03:00
Jordi Ortiz
45b068580b rtsp: Parse the mode=receive/record parameter in transport lines 
We need to support the nonstandard mode=receive, for compatibility
with older libavformat clients.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-07-10 21:20:04 +03:00
Michael Niedermayer
f39bbc9d21 mxfdec: fix off by one error. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-10 13:51:05 +02:00
Tomas Härdin
83728d2d36 mxfdec: only parse next partition pack if parsing forward 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-10 13:51:04 +02:00
Tomas Härdin
34ca5ae51d mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only 
We cannot do this in general since we could be reading
a file with B-frames while lacking an index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-10 13:51:04 +02:00
Joseph Artsimovich
634d670538 mxfdec: fix frame height vs field height confusion 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-07-10 13:51:04 +02:00