apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-05-05 05:59:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
88,415 Commits 7 Branches 0 Tags
bd8f1fa100070952c7a90ac50737dc82787f2b0e
Commit Graph

20390 Commits

Author SHA1 Message Date
James Almer 68727a1dc0 Merge commit '251849f06ce36ce8dc076e0fca2922119fa7e39e' 
* commit '251849f06ce36ce8dc076e0fca2922119fa7e39e':
  mkv: Add support for Spherical Video elements

See 445204cd57

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-17 16:47:30 -03:00
Carl Eugen Hoyos a3accd0c37 lavf/cafenc: Allow muxing opus. 
QuickTime does not require the (unknown) kuki chunk for decoding.
 2017-10-17 21:35:28 +02:00
James Almer 552d2cb6f7 Merge commit '0f8512c4a87b89b4694053d8ffda48066ee1da62' 
* commit '0f8512c4a87b89b4694053d8ffda48066ee1da62':
  mov: Validate spherical metadata version

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-17 15:27:43 -03:00
James Almer 9780d5839e Merge commit '236577230051ad61ec67fa2d68e817d54232d2a0' 
* commit '236577230051ad61ec67fa2d68e817d54232d2a0':
  mov: Ignore old spherical metadata when newer version is present

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-17 15:26:27 -03:00
Jacek Jendrzej f685bbcbe8 avformat: fix build wihout dashenc 
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-10-17 10:04:07 -03:00
Daniel Kucera feed201849 libavformat/wtvdec: return AVERROR_EOF on EOF 
Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
 2017-10-13 17:23:54 +02:00
Michael Niedermayer 80154b1b3a Bump version for master after 3.4 branchpoint 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-11 02:45:37 +02:00
Michael Niedermayer e1de9eab3a Bump minor versions for branching 3.4 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-11 01:23:47 +02:00
bnnm 1954e625b1 avcodec/wmaprodec: support multichannel XMA stream configurations 
Signed-off-by: bnnm <bananaman255@gmail.com>

Now accepts any combination of 1/2ch streams, described in the RIFF chunks/extradata
 2017-10-09 17:06:19 +02:00
Carl Eugen Hoyos 14b1553939 lavf/adp: Fix the probe function on systems with signed char. 2017-10-09 02:57:48 +02:00
Carl Eugen Hoyos 2386cfc1ae lavf/rtpenc: Add support for little-endian G.726. 2017-10-07 20:47:10 +02:00
Carl Eugen Hoyos 50462e3e5e lavf/sdp: Fix MIME-type for big-endian G.726. 
RFC 3551 defines "G726" for little-endian ("right-justified") G.726
and announces "AAL2-G726" for big-endian ("left-justified") G.726.
 2017-10-07 20:41:38 +02:00
Carl Eugen Hoyos a20f64bee2 lavf/img2dec: Auto-detect svg images. 2017-10-07 03:42:00 +02:00
James Almer cc5b7601f7 avformat/mp3enc: flush buffered packets if referencing fails 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-10-06 21:59:11 -03:00
Luca Barbato 1e27837265 rtsp: Move message parsing to a separate function 
Make easier to handle the polling function before we implement
full threading support.

(cherry picked from libav commit ca960161f0)
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-10-06 00:22:10 -03:00
Lukas Stabe 1fd80106be avformat: fix id3 chapters 
These changes store id3 chapter data in ID3v2ExtraMeta and introduce
ff_id3v2_parse_chapters to parse them into the format context if needed.

Encoders using ff_id3v2_read, which previously parsed chapters into the
format context automatically, were adjusted to call
ff_id3v2_parse_chapters.

Signed-off-by: wm4 <nfxjfg@googlemail.com>
 2017-10-05 17:10:23 +02:00
Tobias Rapp c941e99b7f avformat/wavenc: replace literal numbers with enum constants 
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
 2017-10-05 09:49:22 +02:00
Jan Ekström ffc58b2ce2 movenc: take packet dts shifting into mention in check_pkt 
This FFmpeg-specific "fuzzer fix" was never perfect, but now it
stopped encoding of actual content with a big enough DTS shift.
This returns the function to its original state of results
before negative CTS offsets were added.

I remember dealing with this function before, but somehow had
forgotten about it during VDD. The test cases not tripping this
over also didn't help.
 2017-10-04 13:09:29 +02:00
James Almer 1e7b6e47d2 Merge commit '79331df362fb05a0d04ca9489c87e5b80077a3f4' 
* commit '79331df362fb05a0d04ca9489c87e5b80077a3f4':
  rtsp: Lazily set up the pollfd array once

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-03 23:08:06 -03:00
James Almer c2916564d8 Merge commit '5263f464db5f2df74ddf712f6d1221b24475fa8e' 
* commit '5263f464db5f2df74ddf712f6d1221b24475fa8e':
  rtsp: Lazily allocate the pollfd array

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-03 21:40:22 -03:00
James Almer 7c74efeaf8 Merge commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86' 
* commit 'b9b82151a1aaa8bbf389853a6142c4e101d80b86':
  rtsp: Move the pollfd setup out of the for loop

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-03 21:37:37 -03:00
James Almer c244d4af43 Merge commit '150e99d694f33ab9ad678834964909aa315d14a1' 
* commit '150e99d694f33ab9ad678834964909aa315d14a1':
  rtsp: Factor out packet reading

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-03 21:34:08 -03:00
Ingo Brückl 08c7513096 avformat/mp3dec: Fix definition of MIDDLE_BITS 
The number of bits from bit #m to #n is n - m plus 1.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-04 02:16:11 +02:00
James Almer 1902bbbe72 Merge commit 'cd7a2e1502f174c725c0de82711d2c7649057574' 
* commit 'cd7a2e1502f174c725c0de82711d2c7649057574':
  asfdec: fix reading files larger than 2GB

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-03 20:12:15 -03:00
Carl Eugen Hoyos 4590d073cc lavf/mxfdec: Search all components of material track for source package. 
Fixes ticket #5925.

Reviewed-by: Marton
 2017-10-03 23:29:20 +02:00
Michael Niedermayer ef973bd98d avformat/mxfenc: Fix labels for IEC PAL DV 420 2017-10-03 18:34:37 +02:00
Michael Niedermayer a56ec48d42 avformat/mxfenc: Add IEC DV25 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-03 18:34:37 +02:00
James Almer 45121cbdda Merge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146' 
* commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146':
  matroskaenc: factor ts_offset into block timecode computation

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-02 15:26:56 -03:00
Carl Eugen Hoyos e9f9175db6 lavf/bit: Fix the G.729 bit auto-detection. 2017-09-30 20:41:52 +02:00
Carl Eugen Hoyos 6f7bd8cd90 lavf/bit: Use pkt->size instead of a constant for G.729 frame size. 
Makes the code more readable, the muxer may support variable bit-rate in the future.
 2017-09-29 18:46:44 +02:00
Carl Eugen Hoyos 44bdb88811 lavf/bit: Only build the G.729 bit demuxer if requested. 
Fix the condition for the G.729 bit muxer.
 2017-09-29 18:31:18 +02:00
Pablo Montilla 1015982f45 lavf/mov: Allow reading very large files. 
The Sample count in the time-to-sample table is defined as
32-bit unsigned integer by the QT specification.

Fixes ticket #6700.
 2017-09-28 23:46:57 +02:00
Martin Storsjö 5455a44aa5 movenc-test: Add tests for negative cts offsets 
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-28 18:15:45 +02:00
Martin Storsjö 07e4be7ec9 movenc: Add an option for enabling negative CTS offsets 
This reduces the need for an edit list; streams that start with
e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid
in mov/mp4) by shifting the dts values of all packets forward.
This avoids the need for edit lists for such streams (while they
still are needed for audio streams with encoder delay).

This eases conformance with the DASH-IF interoperability guidelines.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-28 18:15:45 +02:00
James Almer 42f27d1b8e Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89' 
* commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89':
  asfdec: Account for different Format Data sizes

See 76853a3e0c

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-28 00:28:38 -03:00
James Almer d99c3af707 Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660' 
* commit 'b446f0e98f85e2e931b476e52b319f1c49244660':
  mov: Do not try to parse multiple stsd for the same track

See 8b43ee4054

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-28 00:10:42 -03:00
James Almer b35f6d3aa3 Merge commit '53ea595eec984e3109310e8bb7ff4b5786d91057' 
* commit '53ea595eec984e3109310e8bb7ff4b5786d91057':
  mov: Rework stsc index validation

See e26e6240b6.

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-27 20:43:17 -03:00
James Almer e666c2b5ec Merge commit '8e67039c6312ba520945f2c01b7b14df056d5ed1' 
* commit '8e67039c6312ba520945f2c01b7b14df056d5ed1':
  asfdec: Use the ASF stream count when iterating

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-26 18:50:30 -03:00
James Almer 4ea63d2cdd Merge commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c' 
* commit '15a92e0c402c830b607f905d6bf203b6cfb4fa8c':
  rtmp: Correctly handle the Window Acknowledgement Size packets

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-26 18:34:25 -03:00
James Almer f858a6e278 Merge commit 'a1a143adb0fd11c474221431417cff25db7d920f' 
* commit 'a1a143adb0fd11c474221431417cff25db7d920f':
  rtmp: Rename packet types to closer match the spec

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-26 18:29:05 -03:00
James Almer 318778de9e Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3' 
* commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3':
  Mark some arrays that never change as const.

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-26 16:02:40 -03:00
James Almer a6596831a0 Merge commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948' 
* commit '708e84cda1bdbffb92847f3d6ccf6fbeb26d9948':
  mov: Avoid memcmp of uninitialised data

Merged-by: James Almer <jamrial@gmail.com>
 2017-09-26 14:48:22 -03:00
Rodger Combs 1b8ef01f04 Merge commit '7295b7373862ee54903b33d6ef3335531dfa93ad' 
* commit '7295b7373862ee54903b33d6ef3335531dfa93ad':
  dashenc: add webm support

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:13:09 -03:00
Rodger Combs a9f51d19d6 Merge commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7' 
* commit '01f1f017d831cf14617aaaeafcec3ae3a81efce7':
  dashenc: use avio_dynbuf instead of packet_write callback

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:12:19 -03:00
Rodger Combs 5c9373385d Merge commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e' 
* commit 'dce2929efa8e82b0832a828f7e8cb81ff8c20a4e':
  dashenc: copy language and role metadata from streams assigned to sets

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:11:50 -03:00
Rodger Combs 3f7a8bb67b Merge commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115' 
* commit 'ca9bc9de690258d4761a19b0df6e9c9113b80115':
  dashenc: default to one AdaptationSet per stream

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:11:25 -03:00
Rodger Combs c0fae3ff90 Merge commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99' 
* commit 'efd2fc41b3f0749f9715d50b581f22bbaa8c5b99':
  dashenc: allow assigning all streams of a media type to an AdaptationSet

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:11:02 -03:00
Rodger Combs 777d53c793 Merge commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61' 
* commit '3d23a5f96ad72961c14ba3a0c2add8f2ab374b61':
  dashenc: add support for assigning streams to AdaptationSets

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:10:30 -03:00
Rodger Combs 3b9ef13588 Merge commit '9df9309d233f59d9706444a1e24ac24139f2640d' 
* commit '9df9309d233f59d9706444a1e24ac24139f2640d':
  dashenc: calculate stream bitrate from first segment if not available

Merged-by: Rodger Combs <rodger.combs@gmail.com>
 2017-09-26 14:02:44 -03:00
James Almer 52223ffe44 Revert "lavf/dashenc: update bitrates on dash_write_trailer" 
This reverts commit 89c0fda5f4.

A different solution will be committed instead.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-09-26 13:59:56 -03:00