2151 Commits

Author SHA1 Message Date
James Dong
b72081966d Use audio clock as the reference media clock
o Only do this for realtime applications
o Adjust other track clock based on audio clock
o Assume other track uses wall clock as the media clock
o Use some heuristics to reduce the size of stts box by 2/3.

- also
o Remove one unused key from MetaData.h

Change-Id: Ib9432842627b61795b533508158c25258a527332
2010-08-13 18:12:48 -07:00
James Dong
38a9f4050a am e95d192f: Mainly fix two mistakes that I made:
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
  Mainly fix two mistakes that I made:
2010-08-12 17:02:42 -07:00
Mike Dodd
2f02044944 am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp

* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
  Support getting codec, width, and height in URL for gtalk playback.
2010-08-12 16:47:52 -07:00
James Dong
e95d192fae Mainly fix two mistakes that I made:
1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
   release it would lead to crash

2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)

Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
2010-08-12 16:47:17 -07:00
Mike Dodd
5f96138ba6 Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 2010-08-12 16:45:19 -07:00
Andreas Huber
73af0a9211 am 72ac1f26: Fix software avc encoder crash at EOS.
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp

* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
  Fix software avc encoder crash at EOS.
2010-08-12 16:18:19 -07:00
Andreas Huber
72ac1f26d7 Fix software avc encoder crash at EOS.
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
2010-08-12 16:14:29 -07:00
Mike Dodd
8741dfacf2 Support getting codec, width, and height in URL for gtalk playback.
Format is rtsp://gtalk/codec/width/height

For example:
  rtsp://gtalk/H263-1998/320/200

Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
2010-08-12 16:04:35 -07:00
James Dong
b408f5490b am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes
Merge commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9' into gingerbread-plus-aosp

* commit 'd790c6485a388a3e8045dbd18b903b20a7dcf0d9':
  Add lost preview surface detection in the JNI layer
2010-08-12 13:16:56 -07:00
Andreas Huber
3bf8c3427f am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s range if it already has a range applied." into gingerbread
Merge commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4' into gingerbread-plus-aosp

* commit 'ae3a1f45951aeb716e1f6b9a99a09838eb55dab4':
  Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
2010-08-12 13:14:37 -07:00
Andreas Huber
53895c6a0e am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbread
Merge commit '66aa0f3d950f7f842327b47592baa920e855925c' into gingerbread-plus-aosp

* commit '66aa0f3d950f7f842327b47592baa920e855925c':
  APacketSource is too verbose.
2010-08-12 13:14:33 -07:00
James Dong
8473db0254 am 708ec39c: Don\'t send late frames to software encoders for encoding
Merge commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad' into gingerbread-plus-aosp

* commit '708ec39c21568e0c2aa3d20c681f0e14ee6134ad':
  Don't send late frames to software encoders for encoding
2010-08-12 13:14:19 -07:00
James Dong
d790c6485a Add lost preview surface detection in the JNI layer
Throws an IOException if this happens rather than crashes

Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
2010-08-12 11:59:56 -07:00
Andreas Huber
ae3a1f4595 Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread 2010-08-12 11:02:17 -07:00
Andreas Huber
66aa0f3d95 Merge "APacketSource is too verbose." into gingerbread 2010-08-12 11:02:06 -07:00
Andreas Huber
00237b79a0 Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied.
Change-Id: I7cc468a3095537347d86803579001458b62fcadb
2010-08-12 10:58:24 -07:00
James Dong
708ec39c21 Don't send late frames to software encoders for encoding
o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
2010-08-12 10:40:58 -07:00
James Dong
8aa244eab7 am 45cb3cfa: Merge "Handle large audio lost" into gingerbread
Merge commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261' into gingerbread-plus-aosp

* commit '45cb3cfacf3b07ae3c5f15eba9bbbcd060cee261':
  Handle large audio lost
2010-08-12 10:12:28 -07:00
James Dong
f4e26da1af am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp

* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
  Fix a crash due to unnecessary check on the codec config data for H263 video track
2010-08-12 10:12:21 -07:00
James Dong
45cb3cfacf Merge "Handle large audio lost" into gingerbread 2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8 Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 2010-08-12 10:07:38 -07:00
James Dong
0386d04b19 am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
Merge commit '581581fe1addfac8913c8d4d6c88eed6ded90de4' into gingerbread-plus-aosp

* commit '581581fe1addfac8913c8d4d6c88eed6ded90de4':
  Fix all fd leaks in authoring engine
2010-08-12 09:22:17 -07:00
James Dong
581581fe1a Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Andreas Huber
3f55576e04 APacketSource is too verbose.
Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
2010-08-12 09:07:20 -07:00
James Dong
c6280bce51 Fix all fd leaks in authoring engine
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
2010-08-11 17:18:30 -07:00
James Dong
7ae08a6d79 Fix a crash due to unnecessary check on the codec config data for H263 video track
Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
2010-08-11 15:58:59 -07:00
Andreas Huber
136d8336b6 am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
  This code in CameraSource really should hold the lock.
2010-08-11 13:28:51 -07:00
Andreas Huber
90d1d10427 Merge "This code in CameraSource really should hold the lock." into gingerbread 2010-08-11 13:20:59 -07:00
Andreas Huber
22bd242478 This code in CameraSource really should hold the lock.
Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
2010-08-11 12:34:32 -07:00
Yu Shan Emily Lau
1ded9f9563 am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp

* commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54':
  Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
2010-08-10 20:09:24 -07:00
Yu Shan Emily Lau
fd4a7c83b2 Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Change-Id: I51008ffdbe60e7e0b298091eb914b74f2d6731f8
2010-08-10 20:02:07 -07:00
James Dong
afe5305855 Handle large audio lost
Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
2010-08-10 19:59:04 -07:00
Andreas Huber
d35498f606 am 1a140bf6: Merge "Remove some obsolete code." into gingerbread
Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp

* commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
  Remove some obsolete code.
2010-08-10 14:15:11 -07:00
Andreas Huber
6fa131105d Remove some obsolete code.
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
2010-08-10 13:48:53 -07:00
James Dong
b9ddd779ae am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread
Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp

* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
  Add input buffer size check for software video encoders
2010-08-10 13:28:56 -07:00
James Dong
10ed3f7438 Merge "Add input buffer size check for software video encoders" into gingerbread 2010-08-10 13:27:09 -07:00
Andreas Huber
4dc41bb445 am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp

* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
2010-08-10 13:01:58 -07:00
Andreas Huber
18f0174ff4 Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread 2010-08-10 12:59:27 -07:00
Andreas Huber
193985ffd5 am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread
Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp

* commit '235be391f3b9cd79e525de87757e361ae044940d':
  Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
2010-08-10 11:45:01 -07:00
Andreas Huber
235be391f3 Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread 2010-08-10 11:39:38 -07:00
Andreas Huber
f88f84414a We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
2010-08-10 11:38:18 -07:00
James Dong
e6daea5940 Add input buffer size check for software video encoders
Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
2010-08-10 10:46:11 -07:00
James Dong
a04883412e am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp

* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
  Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
2010-08-10 10:44:25 -07:00
James Dong
f3b7859fc9 Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
o Assume there is only a single output buffer containing such information.
  This simplifies the logic in MP4 file writer

o Output SPS and PPS in the very first buffer for software AVC encoder
  This is to make AVC encoder work with the MP4 file writer

o Add timestamp value for codec config data

Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
2010-08-10 10:20:15 -07:00
Andreas Huber
aa92ef7a56 Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
2010-08-10 10:10:40 -07:00
Jean-Michel Trivi
2f5f154d6a am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone
2010-08-09 19:53:20 -07:00
James Dong
fa4f57fe0f am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp

* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
  Support multiple PPS and SPS in avcC box
2010-08-09 19:53:12 -07:00
Andreas Huber
e14923b0c8 am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp

* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
2010-08-09 19:53:01 -07:00
Eric Laurent
18afcee767 am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp

* commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
  Added tests for audio effects in MediaFrameworkTest
2010-08-09 19:52:53 -07:00
Eric Laurent
1ece7d6873 am 2a6b80bc: Fixed several audio effects problems.
Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp

* commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
  Fixed several audio effects problems.
2010-08-09 19:52:43 -07:00