Michael Niedermayer
d898482ae3
Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'
...
* commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530':
rtpdec_hevc: Drop extra sanity check for size of input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09 20:00:11 +01:00
Vittorio Giovara
bfeb83a8b7
rtpdec_hevc: Drop extra sanity check for size of input packet
...
In this case len is always at least 3, since it is checked against
RTP_HEVC_PAYLOAD_HEADER_SIZE + 1 before entering the switch block.
Bug-Id: CID 1238784
2015-03-09 12:57:01 +00:00
Michael Niedermayer
d2a5c6f210
Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'
...
* commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74':
rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 23:44:25 +01:00
Michael Niedermayer
17773f49b7
Merge commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15'
...
* commit '3567b91e49c6ae101c9a35c90f46b8ad9890ac15':
rtpdec_hevc: Share the implementation of fragmented packets with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 23:23:26 +01:00
Michael Niedermayer
0f8de2b5f1
Merge commit 'f3449062a8d100ac4f703647336c32b126aa99f1'
...
* commit 'f3449062a8d100ac4f703647336c32b126aa99f1':
rtpdec_hevc: Reduce indentation level by returning early on errors
Conflicts:
libavformat/rtpdec_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 23:16:46 +01:00
Michael Niedermayer
29f9d82d23
Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'
...
* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
rtpdec_hevc: Share the implementation of parsing a=framesize with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 23:03:12 +01:00
Michael Niedermayer
df38883607
Merge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'
...
* commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684':
rtpdec_hevc: Add asterisks at the start of each long comment line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 22:55:55 +01:00
Michael Niedermayer
3804d73e46
Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'
...
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
rtpdec: Get rid of all trivial .alloc/.free functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 22:55:20 +01:00
Michael Niedermayer
11fb625858
Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'
...
* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4':
rtpdec: Set need_parsing via a handler field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 22:34:08 +01:00
Martin Storsjö
ec96a89c3e
rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions
...
This makes it clear that the individual parsing functions can't
touch the parsed out value.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 23:07:22 +02:00
Michael Niedermayer
30c863fdfa
Merge commit '3cd5828fc0007e6d056067444de053a34ddedd02'
...
* commit '3cd5828fc0007e6d056067444de053a34ddedd02':
rtpdec: Add missing trailing commas
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 22:03:19 +01:00
Martin Storsjö
3567b91e49
rtpdec_hevc: Share the implementation of fragmented packets with h264
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:25:28 +02:00
Martin Storsjö
f3449062a8
rtpdec_hevc: Reduce indentation level by returning early on errors
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:25:21 +02:00
Martin Storsjö
8633fb47db
rtpdec_hevc: Share the implementation of parsing a=framesize with h264
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:24:36 +02:00
Martin Storsjö
5956f489d0
rtpdec_hevc: Add asterisks at the start of each long comment line
...
This is the common style for such comments.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:24:27 +02:00
Martin Storsjö
5d8cae4573
rtpdec: Get rid of all trivial .alloc/.free functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:24:19 +02:00
Martin Storsjö
2b982e92f4
rtpdec: Set need_parsing via a handler field
...
This avoids implementing a full function just to set this one
field.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:22:41 +02:00
Martin Storsjö
3cd5828fc0
rtpdec: Add missing trailing commas
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 16:20:02 +02:00
Michael Niedermayer
596f81c75b
Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
...
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc':
rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units
Conflicts:
libavformat/rtpdec_hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23 21:01:44 +01:00
Martin Storsjö
fe208ca54b
rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units
...
Only the first aggregation unit has 2 bytes (DONL) prepended, if
such a field is in use.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-23 15:33:20 +02:00
Michael Niedermayer
e3cc93aacf
Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'
...
* commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9':
rtpdec_hevc: Implement parsing of aggregated packets
Conflicts:
libavformat/rtpdec_hevc.c
See: b6f577dbb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 13:22:02 +01:00
Michael Niedermayer
2b2b6d1e3c
Merge commit 'b878ba03e7e088777cc5083766e0b2a293e716ee'
...
* commit 'b878ba03e7e088777cc5083766e0b2a293e716ee':
rtpdec_hevc: Initialize variables to silence false positive compiler warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 13:09:24 +01:00
Michael Niedermayer
5402a22845
Merge commit '10e2d8b5562d8729e4eefbcec63a11eb8a0c502c'
...
* commit '10e2d8b5562d8729e4eefbcec63a11eb8a0c502c':
rtpdec_hevc: Use a shared function for parsing parameter sets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 13:02:42 +01:00
Thomas Volkert
cbdd1806ea
rtpdec_hevc: Implement parsing of aggregated packets
...
With significant changes by Martin Storsjö, to use the shared
function instead of reimplementing it.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:32:50 +02:00
Martin Storsjö
b878ba03e7
rtpdec_hevc: Initialize variables to silence false positive compiler warnings
...
For some reason, clang didn't warn about this prior to using the
shared function.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:32:47 +02:00
Martin Storsjö
10e2d8b556
rtpdec_hevc: Use a shared function for parsing parameter sets
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:32:44 +02:00
Thomas Volkert
b6f577dbb2
rtpdec_hevc: correct parsing of aggregated packets
...
reported by tim dot yao at amlogic dot com
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12 20:43:37 +01:00
Michael Niedermayer
4adf75cade
avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17 20:40:21 +01:00
Michael Niedermayer
e162db66a2
Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'
...
* commit '350ed1829268d343b791208c8fd1cddd44d52a8e':
rtpdec_hevc: drop unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 22:25:14 +02:00
Vittorio Giovara
350ed18292
rtpdec_hevc: drop unnecessary check
...
len is always >=1 in that case.
Bug-Id: CID 1238784
2014-10-20 10:44:42 +01:00
Michael Niedermayer
f09162c06b
Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'
...
* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 23:23:53 +02:00
Michael Niedermayer
60a876fe7b
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
...
* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 22:03:11 +02:00
Martin Storsjö
ced7238cd0
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:32 +03:00
Martin Storsjö
752e71e74f
rtpdec_hevc: Rename a variable for clarity
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:30 +03:00
Michael Niedermayer
6afc319eee
Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'
...
* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780':
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 19:04:22 +02:00
Martin Storsjö
9b7f932ee5
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
...
These are assembled into extradata in the order vps/sps/pps/sei.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 12:12:02 +03:00
Michael Niedermayer
e27f781aeb
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
...
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
rtpdec_hevc: Drop a duplicated, nonstandard entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-24 17:25:34 +02:00
Vittorio Giovara
c463dfc7e4
rtpdec_hevc: Drop a duplicated, nonstandard entry
...
The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).
Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.
Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-24 10:44:14 +03:00
Thomas Volkert
dcdc1cbf43
rtpdec_hevc: do not print an error message if the received packet has a valid header but lacks additional bytes as payload
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-21 15:07:26 +02:00
Michael Niedermayer
4bc4f6f170
Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'
...
* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
rtpdec: HEVC/H.265 support
Conflicts:
Changelog
libavformat/rtpdec_hevc.c
libavformat/version.h
See: 96b2ba68c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 14:56:53 +02:00
Thomas Volkert
95e177eeb2
rtpdec: HEVC/H.265 support
...
As specified in draft-ietf-payload-rtp-h265-06.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-09-03 02:39:24 +02:00
Carl Eugen Hoyos
f22c24bd7a
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
2014-08-30 13:01:51 +02:00
ThomasVolkert
96b2ba68c4
avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing
2014-08-26 02:18:08 +02:00