Commits · ef6934cdf9a84321455e106f52432f93a2e2541e · halo / frameworks_av

14 Oct, 2016 1 commit
- Merge "Fix divide by zero" into lmp-dev · ef6934cd
  Marco Nelissen authored 8 years ago
  
  ef6934cd
13 Oct, 2016 23 commits
- Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b1 am: a5477b11 · 391b2806
  Marco Nelissen authored 8 years ago
```
am: 913b7564  -s ours

Change-Id: I9698f264d5285632c8f7f7d83726da35499f290e
```
  391b2806
- DO NOT MERGE Fix divide by zero am: febbd52c am: 55ce7e5d · 76bc4166
  Marco Nelissen authored 8 years ago
```
am: 1b3f61ce  -s ours

Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e
```
  76bc4166
- Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b1 · 913b7564
  Marco Nelissen authored 8 years ago
```
am: a5477b11

Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a
```
  913b7564
- DO NOT MERGE Fix divide by zero am: febbd52c · 1b3f61ce
  Marco Nelissen authored 8 years ago
```
am: 55ce7e5d

Change-Id: I792667b35aacfa1b910a332d855f002615041408
```
  1b3f61ce
- Merge "DO NOT MERGE Fix divide by zero" into klp-dev · a5477b11
  Marco Nelissen authored 8 years ago
```
am: 2c28e5b1

Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e
```
  a5477b11
- DO NOT MERGE Fix divide by zero · 55ce7e5d
  Marco Nelissen authored 8 years ago
```
am: febbd52c

Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
```
  55ce7e5d
- Fix divide by zero · 12416c41
  Marco Nelissen authored 8 years ago
```
and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
```
  12416c41
- Merge "DO NOT MERGE Fix divide by zero" into klp-dev · 2c28e5b1
  Marco Nelissen authored 8 years ago
  
  2c28e5b1
- Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:... · 25a681e6
  Ricardo Garcia authored 8 years ago
```
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b00 am: 6732f45e
am: 24566f29

Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14
```
  25a681e6
- Fix potential NULL dereference in Visualizer effect am: 874f9e0b am: f060479b · f4a63f67
  rago authored 8 years ago
```
am: bcc7230b

Change-Id: If5d6fefb276341472d827bac3f349561f7d1d990
```
  f4a63f67
- Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b00 · 24566f29
  Ricardo Garcia authored 8 years ago
```
am: 6732f45e

Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729
```
  24566f29
- Fix potential NULL dereference in Visualizer effect am: 874f9e0b · bcc7230b
  rago authored 8 years ago
```
am: f060479b

Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2
```
  bcc7230b
- Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev · 6732f45e
  Ricardo Garcia authored 8 years ago
```
am: eee86b00

Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728
```
  6732f45e
- Fix potential NULL dereference in Visualizer effect · f060479b
  rago authored 8 years ago
```
am: 874f9e0b

Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec
```
  f060479b
- Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev · eee86b00
  Ricardo Garcia authored 8 years ago
  
  eee86b00
- Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing."... · 54c0001d
  Pawin Vongmasa authored 8 years ago
```
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef852 am: b512f4ab
am: d18d8fac  -s ours

Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4
```
  54c0001d
- DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b am: 2c76c56d · 7b975626
  Pawin Vongmasa authored 8 years ago
```
am: f1e84ca8  -s ours

Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3
```
  7b975626
- Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing."... · d18d8fac
  Pawin Vongmasa authored 8 years ago
```
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef852
am: b512f4ab

Change-Id: Ic852128c935782783fc03175be9968da6e894e90
```
  d18d8fac
- DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b · f1e84ca8
  Pawin Vongmasa authored 8 years ago
```
am: 2c76c56d

Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378
```
  f1e84ca8
- Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev · b512f4ab
  Pawin Vongmasa authored 8 years ago
```
am: 8caef852

Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef
```
  b512f4ab
- DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. · 2c76c56d
  Pawin Vongmasa authored 8 years ago
```
am: de84a76b

Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b
```
  2c76c56d
- Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev · b6ba3d7e
  Pawin Vongmasa authored 8 years ago
  
  b6ba3d7e
- Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev · 8caef852
  Pawin Vongmasa authored 8 years ago
  
  8caef852
12 Oct, 2016 1 commit

Fix potential NULL dereference in Visualizer effect · 874f9e0b

rago authored 8 years ago

Bug: 30229821

Test: fixing CL. Existing unit tests still pass.

Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0

874f9e0b

11 Oct, 2016 4 commits

stagefright: don't fail MediaCodec.configure if clients use store-meta key am:... · efe63962

Lajos Molnar authored 8 years ago

stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c31 am: d9f6b221
am: 1c44a2ed

Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19

efe63962

stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c31 · 1c44a2ed
Lajos Molnar authored 8 years ago
```
am: d9f6b221

Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5
```
1c44a2ed
stagefright: don't fail MediaCodec.configure if clients use store-meta key · d9f6b221
Lajos Molnar authored 8 years ago
```
am: afb20c31

Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46
```
d9f6b221

stagefright: don't fail MediaCodec.configure if clients use store-meta key · afb20c31

Lajos Molnar authored 8 years ago

Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.

Bug: 31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be

afb20c31

06 Oct, 2016 1 commit

DO NOT MERGE Fix divide by zero · febbd52c

Marco Nelissen authored 8 years ago

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32

febbd52c

30 Sep, 2016 2 commits
- DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. · de84a76b
  Pawin Vongmasa authored 8 years ago
```
Bug: 31449945
Change-Id: If2708b3006c22393e80a2557f93d8a71e4e7bf16
```
  de84a76b
- DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. · 0338b14e
  Pawin Vongmasa authored 8 years ago
```
Bug: 31449945
Change-Id: Icc5714bd2459c053c0a913b1c27d9ffbef5b2d2a
```
  0338b14e
22 Sep, 2016 7 commits
- Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222 am: a78bd18c · 8ede96a5
  Robert Shih authored 8 years ago
```
am: 9578341c

Change-Id: Ia3bdadd25c957b6a5e3a1a7fe0e5e414ff510721
```
  8ede96a5
- SampleIterator: clear members on seekTo error am: 03237ce0 am: 8468b898 · d4ddd555
  Robert Shih authored 8 years ago
```
am: e0d588b8

Change-Id: I62d47aa490a6fb62eabd5f80da26e47de69b8b1c
```
  d4ddd555
- Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222 · 9578341c
  Robert Shih authored 8 years ago
```
am: a78bd18c

Change-Id: Iec88e35a497a7503b589739082b86ae5bc0e2479
```
  9578341c
- SampleIterator: clear members on seekTo error am: 03237ce0 · e0d588b8
  Robert Shih authored 8 years ago
```
am: 8468b898

Change-Id: I4d81b7bd8732f03d0308740b96418203d17cd65b
```
  e0d588b8
- Merge "SampleIterator: clear members on seekTo error" into klp-dev · a78bd18c
  Robert Shih authored 8 years ago
```
am: 610a9222

Change-Id: I39efc9f85b13cb1212565b58f8907fd53b31920c
```
  a78bd18c
- SampleIterator: clear members on seekTo error · 8468b898
  Robert Shih authored 8 years ago
```
am: 03237ce0

Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269
```
  8468b898
- Merge "SampleIterator: clear members on seekTo error" into klp-dev · 610a9222
  Robert Shih authored 8 years ago
  
  610a9222
21 Sep, 2016 1 commit
- Limit mp4 atom size to something reasonable · cb898dca
  Marco Nelissen authored 8 years ago
```
Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
```
  cb898dca