734 Commits

Author SHA1 Message Date
Frank Galligan
c97e3e7d60 Add support to output sub-sample encryption information.
See http://wiki.webmproject.org/encryption/webm-subsample-encryption
for the format.

Change-Id: Ia5d6f3566b92c46911704108d3e86cd0fac9ee34
2016-10-13 09:04:52 -07:00
James Zern
26f434423f MakeUID: quiet unused param warning in Android builds
Change-Id: Id389af1d92184009c511ff641e86ac27c6767567
2016-09-28 18:51:03 -07:00
Frank Galligan
d6af52a1e6 Change check to fix compile error.
Change-Id: I01490cca4a0b6ae51b20117738a723b8c9788919
2016-09-15 15:33:23 -07:00
Michael Bradshaw
17200208c5 webm_parser: Add Mesh value for ProjectionType
Change-Id: I0e2be134cfefdb62edc54288720523646d01479a
2016-09-13 18:16:54 -07:00
Michael Bradshaw
78f2c5ab78 webm_parser: Use ./ prefix for includes
Fixes a lint presubmit check.

Change-Id: If06a7b11c18742dfe659136736082945a4853b3e
2016-09-08 15:42:22 -07:00
Michael Bradshaw
da62f659e4 webm_parser: Remove webm/ prefix from public includes
Using a webm/ prefix requires clients to add the webm_parser/include
path to their header search paths. This is inconvenient and an
unnecessary restriction.

Change-Id: If73a4433ad42f326a544766beca5f05710f52243
2016-09-07 16:57:44 -07:00
Michael Bradshaw
e15e8f2cc7 webm_parser: Update README build instructions
Change-Id: Iade055ff076b107ac1665493dad18e812025c31f
2016-09-01 15:52:18 -07:00
Tom Finegan
5023f2b5ca mkvmuxer: Fix Colour::Valid()
Ignore Colour::kValueNotPresent and allow writing of partial
Colour elements, and add a test confirming this works.

Change-Id: I77e6bd0d92cadc46142af92de2f9f474006dceb7
2016-09-01 11:56:03 -07:00
Tom Finegan
cf1620444f mkvmuxer_tests: Actually test cue points in the cue point test.
Instead of blindly doing a file compare and hoping that we're not
in a garbage in garbage out situation.

Change-Id: Ie2f278e09ad67b3e8f40e602fcdd5c9ffb5e1b7d
2016-08-31 21:18:30 -07:00
Tom Finegan
93e9fb35f9 Validate Colour element values.
webm:1284

Change-Id: Idc9fc2eee41e7ab445d90366c5ee3e8ca2509c81
2016-08-31 21:18:24 -07:00
Tom Finegan
8036925b43 mkvparser_tests: Add Projection element test.
Change-Id: Ib57449f409548b23ae1d788ca07dc19ba21e7763
2016-08-31 10:00:05 -07:00
Tom Finegan
f52d38cc5c mkvparser_tests: Add Colour element test.
Change-Id: Ifc0c9db863a0ebe17dbab0e94b82b6a04dd64926
2016-08-31 10:00:04 -07:00
Tom Finegan
826436a42f mkvparser: minor SeekHead::Entry clean up.
- Store actual element ID in SeekHead::Entry id field (instead
  of a decoded EBML int, which is completely _wrong_).
- Add a SeekHead::Entry constructor so we get initialized values
  in SeekHead::Entry's when parsing an Entry fails.

Change-Id: I152fae54628cb84918917139dba0cd0b42a44a57
2016-08-31 10:00:04 -07:00
Tom Finegan
24fb44aa1a mkvmuxer_tests: Add Projection element test.
Change-Id: I9a1e56d0846f43851ed0430ec52e2d7b816661fc
2016-08-31 10:00:04 -07:00
Tom Finegan
1e0a8eaa3c mkvmuxer_tests: Add Colour element test.
Change-Id: I5348930fb74d43f3fc4e1815d13a525bda70f4a0
2016-08-31 10:00:02 -07:00
Tom Finegan
027861614c mkvmuxer: Colour accessors/mutators.
Make data members of Colour and children private, and add
accessors and mutators for the changes members.

Change-Id: I203f6b4e8047cd4dae5c1b662649b535e05148fd
2016-08-30 18:13:51 -07:00
Tom Finegan
ce52f6e31d Merge "Add mkvparser wrapper functions." 2016-08-30 17:23:14 +00:00
Tom Finegan
6e5cbc09c0 Merge "webm_info: Add Projection element support." 2016-08-30 17:22:45 +00:00
Tom Finegan
0a039cb851 Merge "mkvmuxer_sample: Add support for Projection element." 2016-08-30 17:22:29 +00:00
Tom Finegan
149e8e997c Merge "mkvparser_sample: Add support for Projection element." 2016-08-30 17:21:37 +00:00
Tom Finegan
43f40c453d Merge "mkvparser: Add Projection element support." 2016-08-30 17:21:28 +00:00
Tom Finegan
0c9a19e20b Merge "mkvmuxer: Add Projection element support." 2016-08-30 17:21:17 +00:00
Michael Bradshaw
ff667d5fb4 Merge "Add support for the Projection element" 2016-08-30 16:49:37 +00:00
Tom Finegan
2346f8fafa Add mkvparser wrapper functions.
Add a couple mkvparser wrapper functions for testing mkvmuxer
output. Also expose HasCuePoints() via test_util.h for use
in cue point related tests.

Change-Id: I77321840926f41b60b6ceac65a1e3cfd79b7d2c2
2016-08-29 14:51:28 -07:00
Tom Finegan
54d6b6b60e webm_info: Add Projection element support.
Part of the Spherical Video V2 draft specification:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: If37a7e3ede452a2545f613b50cd3cedd5dd64f09
2016-08-29 14:51:28 -07:00
Tom Finegan
65fee06599 mkvmuxer_sample: Add support for Projection element.
Part of the Spherical Video V2 draft specification:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: If8cc7a102933ca7fe81990919dbabe7db97812f8
2016-08-29 14:51:25 -07:00
Tom Finegan
9a3f2b5762 mkvparser_sample: Add support for Projection element.
Part of the Spherical Video V2 draft specification:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: I06d8e55d197fcf106b91d8d795ef85163ef5c2d5
2016-08-29 14:29:30 -07:00
Tom Finegan
41e814a008 mkvparser: Add Projection element support.
Part of the Spherical Video V2 draft specification:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: I431349898b4018189cc58ce2cd67158ffb4c7f80
2016-08-29 14:29:30 -07:00
Tom Finegan
483a0ff800 mkvmuxer: Add Projection element support.
Part of the Spherical Video V2 draft specification:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: Ia935ba975a0f01c1fb2919325ab7f70254c2ed10
2016-08-29 14:29:25 -07:00
Michael Bradshaw
676a7135d1 Add support for the Projection element
It's a part of the Google Spatial Media V2 spec:
https://github.com/google/spatial-media/blob/master/docs/spherical-video-v2-rfc.md

Change-Id: I52f05e34b19239af09774da2f88eb584a0bfa628
2016-08-29 13:15:07 -07:00
Tom Finegan
725f36207e mkvmuxer: Fix memory leak when Colour is set multiple times.
Change-Id: I5650ca1116a5ae678b11ac5f6a8abf1590bc9e3f
2016-08-26 21:08:30 -07:00
Tom Finegan
fa182de6e4 mkvparser_sample: Add output of audio track codec private size.
Change-Id: Ie0a2a379cd4e68ae751e514b3d3b2025c254500b
2016-08-26 21:08:29 -07:00
Tom Finegan
4aa5338ba5 Merge "mkvparser_tests: Add invalid BlockGroup test." 2016-08-26 22:10:03 +00:00
Tom Finegan
8f521f2192 mkvparser_tests: Add invalid BlockGroup test.
Change-Id: I2b24859a92d2beb5558c2afa817237c1f78f644d
2016-08-25 13:18:19 -07:00
Michael Bradshaw
dae3d48a6f Merge "Remove docs saying binary elements default to 0" 2016-08-25 18:36:29 +00:00
Michael Bradshaw
39137d7385 Remove docs saying binary elements default to 0
They don't have a real default, and certainly not an integer value of 0.

Change-Id: I839291b9960315241068f99a0926fca3ca27ac18
2016-08-25 11:19:52 -07:00
Tom Finegan
2349904020 Merge "Fix legacy Makefile." 2016-08-25 17:52:16 +00:00
Michael Bradshaw
16e5d2a369 Merge "Do not skip over unknown elements at the root level" 2016-08-25 17:43:34 +00:00
Michael Bradshaw
80685d3865 Do not skip over unknown elements at the root level
OnUnknownElement() should be called to handle them.

Change-Id: Iebd99631f094e95d0c3e75952930962e15826bac
2016-08-24 17:37:03 -07:00
Tom Finegan
c1475044b4 Fix legacy Makefile.
- Replace definition of EXES var (fixes all target building
  nothing).
- Update mkvmuxer/mkvmuxer sample target dependencies and
  exe names.

Change-Id: I2951e0b60ae8dc18b2a7cae28fa28624967df987
2016-08-24 12:21:56 -07:00
Tom Finegan
58711e8c3e mkvparser_sample: Fix version info string.
Change-Id: I87dfe753358aede2eb5219cfef7456151cb3a7e7
2016-08-24 12:03:08 -07:00
Tom Finegan
837746f4d2 mkvparser_tests: Add invalid block test.
Add test that confirms expected failure when a block
that ends beyond the current cluster is encountered.

Change-Id: I27abcab6d00b78c14b7ca00f51c97e43c5cdd34c
2016-08-23 17:55:52 -07:00
Tom Finegan
207cd80a86 Disambiguate sample sources and targets.
sample => mkvparser_sample
sample_muxer => mkvmuxer_sample

Change-Id: Iba6a1276da9c1bb4a46fc5c4521392f89f08a59e
2016-08-23 17:55:52 -07:00
Tom Finegan
a112d71cd0 mkvparser_tests: Refactor invalid file loading code.
Combine duped loading code into one method.

Change-Id: I3c4f9b7003f032a04b734f452f3c684d1af8e841
2016-08-23 17:55:49 -07:00
Tom Finegan
5dea33eacc Disambiguate test source and target names.
Rename source files and targets to better reflect what is
actually being tested.

muxer_tests => mkvmuxer_tests
parser_tests => mkvparser_tests

Change-Id: I921901f37d269f294b96ba20732b31c27f81945b
2016-08-23 10:29:30 -07:00
Tom Finegan
125049eecd parser_tests: Add another truncated chapter string test.
Causes mkvparser to fail in a slightly different way.

Change-Id: Id60fd43e6d0ef1871842367d19db52f60a8721cc
2016-08-19 12:44:43 -07:00
Tom Finegan
1de8d4cb4f parser_tests: Add truncated chapter string test.
Change-Id: I1714fbfea5bab61cca61cd32a0a0d30315ed56fc
2016-08-19 12:13:14 -07:00
Tom Finegan
ff8c2b6af7 parser_tests: Move cue validation to test_util.
And tidy it up a bit.

Change-Id: I68e7f16ad2aa922fdb064802e8986a6955364c32
2016-08-19 11:57:08 -07:00
Tom Finegan
4b0690faa2 parser_tests: Add invalid lacing test.
Also fixes leak this test exposed in mkvparser::Cluster.

Change-Id: I06ae11b72bc89219b6b2b407b4cc215982e3ae65
2016-08-19 11:57:05 -07:00
Tom Finegan
64ae831047 Merge "mkvmuxer: Set default doc type version to 4." 2016-08-12 21:59:33 +00:00