Ryan VanderMeulen
46f9b852df
Merge m-c to inbound.
2014-01-27 15:24:00 -05:00
Jacek Caban
895c82db13
Bug 962354 - Fixed cross compilation on case sensitive OSes.
...
--HG--
extra : rebase_source : 1fc397a1fc5086b04f79addf6c162f66b845b991
2014-01-27 19:38:47 +01:00
Shelly Lin
d88b0d14f9
Bug 957439 - Do not assert at Pause or Resume on unsupported input stream. r=roc, r=jsmith
2014-01-27 10:33:00 +08:00
Randy Lin
c99b2ced4f
Bug 891705 - [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps, r=rillian
...
This is an integrated patch which includes:
1. Bug 891705: [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps
2. Bug 950567: [MediaEncoder] Phase-in libmkv library. r=giles
3. bug 883749: Implement Vorbis encoding. r=rillian
4. bug 881840: Implement VP8 track encoder. r=rillian
2014-01-15 14:21:14 +08:00
Ryan VanderMeulen
8dc9129e87
Merge m-c to inbound.
2014-01-23 15:58:06 -05:00
John Lin
b7d8e24543
Bug 961925 - Move MOZ_OMX_ENCODER definition from local moz.build to global configuration file. r=gps
2014-01-23 09:32:32 -05:00
Carsten "Tomcat" Book
535888eb97
merge b2g-inbound to mozilla-central
2014-01-23 10:20:58 +01:00
Chris Pearce
4d39e9748c
Bug 962354 - Create a threadsafe threadpool singleton for media threads. r=kinetik
2014-01-23 17:21:05 +13:00
Chris Pearce
83582bbc3b
Bug 961885 - Rename the enum entries for HTMLTrackElement.readyState, as HTMLTrackElement::ERROR is defined in some other file that can be included in unified builds, causing errors when we add more files to content/media. r=rillian
2014-01-23 17:19:34 +13:00
Ben Kelly
1ac006397f
Bug 961441: Use MallocSizeOf to report decoded-audio memory. r=cpearce r=njn
2014-01-22 22:14:45 -05:00
Alfredo Yang
5e22ba77fc
Bug 959861 - Testcase for fragmented mp4 playback. r=cpearce
2014-01-22 10:50:23 -05:00
Alfredo Yang
2b2a9d250c
Bug 959861 - Check if the media is seekable in MediaOmxReader::ReadMetadata(). r=cdouble
2014-01-22 10:50:23 -05:00
JW Wang
4c6f58a7e3
Bug 916135 - Part 2: Don't call OMXCodec::pause in emulator mode to prevent getting stuck in paused state of OMXCodec. r=cdouble
2013-12-16 16:30:59 +08:00
JW Wang
7d11cdfa16
Bug 916135 - Part 1: Force releasing codec to prevent timeout in waiting for acquiring h264 codec and set the preload attribute to "auto" to prevent timeout in waiting for loadedmetadata event. r=padenot
2014-01-17 13:58:48 +08:00
Edwin Flores
e373a17f4c
Bug 953394 - Remove debug code r=doublec
2014-01-22 09:59:54 +13:00
Sotaro Ikeda
11014e1136
Bug 961405 - Change GraphicBufferLocked as to use AtomicRefCountedWithFinalize. r=nical, r=pchang, r=doublec, r=mikeh
2014-01-21 13:53:48 -05:00
Benoit Jacob
15ef84b8b5
Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc
...
find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'
find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'
find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'
find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'
find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'
find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'
find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'
find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
2014-01-23 13:26:41 -05:00
Benoit Jacob
981c6431d3
Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel
...
find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
2014-01-23 13:26:40 -05:00
Ryan VanderMeulen
b43ef033c1
Merge b2g-inbound to m-c.
2014-01-19 15:40:48 -05:00
Ryan VanderMeulen
8eeeeece37
Backed out changeset 1395d2a59698 (bug 879668) for landing without review.
2014-01-18 23:00:52 -05:00
John Lin
28a230737b
Bug 879668 - Part 5: Add OmxAudioTrackEncoder to file OmxTrackEncoder. r=roc
2014-01-17 14:30:13 -05:00
Shelly Lin
9a0dd6c5c9
Bug 879668 - Part 4: Add OmxVideoTrackEncoder to file OmxTrackEncoder. r=roc
2014-01-17 14:30:02 -05:00
John Lin
7519996813
Bug 879668 - Part 3: Add OMXCodecWrapper. r=roc
2014-01-17 14:29:41 -05:00
John Lin
4b7023299e
Bug 879668 - Part 2: Add utility function to convert codec data from OMX AVC/H.264 encoder for MP4 container writer. r=roc
2014-01-17 14:29:20 -05:00
Shelly Lin
ab2daf3a31
Bug 879668 - Part 1: Make CreateMutedFrame static. r=roc
2013-12-03 17:50:48 +08:00
Rick Eyre
acf78892f7
Bug 957847 - Fix VTTCue crash at TextTrackCue::AddCue. r=rillian
2014-01-15 11:30:58 -05:00
Tom Schuster
5e3191afd2
Bug 939294 - Change xpidl jsval to handles. r=gabor,bz,khuey,bsmedberg,terrence
2014-01-09 18:39:36 +01:00
Rick Eyre
1fe94a73b3
Bug 882299 - Implement VTTCue::Line r=smaug,rillian,bz
2014-01-15 08:04:00 -08:00
Josh Aas
2fe3f2202b
Remove dead code, stuff that used to override IPDL methods that don't exist any more. No bug. r=jduell,eitan
2014-01-17 13:58:05 -06:00
Josh Aas
cbf4bb1d5b
Bug 960648: Consistently mark IPDL methods as MOZ_OVERRIDE. Part 1. r=bent
2014-01-17 11:46:41 -06:00
Ali Akhtarzada
09cc9a436c
Bug 959123 - Implement CairoImage::GetAsSourceSurface. r=nical
...
Deprecate CairoImage::Data::mSurface and add an mSourceSurface.
Also change all the callers of CairoImage::SetData to set the
SourceSurface as well.
Also change scope of CairoImage::mSource to private
2014-01-17 11:22:09 -05:00
Ed Morley
99155ba26d
Merge mozilla-central and b2g-inbound
...
--HG--
rename : content/events/src/nsDOMEvent.h => dom/events/nsDOMEvent.h
2014-01-15 18:09:12 +00:00
Randy Lin
08cfaa6d12
Bug 959501 - [Media Encoder] Add preferences for video encoder. r=roc
2014-01-14 15:26:04 +08:00
Chris Pearce
778de3dc48
Bug 959440 - Apply MP4Reader cleanups to WMFDecoderModule. r=padenot
...
Update WMFDecoderModule and friends to reflect changes to PlatformDecoderModule
interface in previous patch.
2014-01-15 16:14:15 +13:00
Chris Pearce
f6c08a2043
Bug 959440 - Various cleanups in MP4Reader. r=kinetik
...
Change PlatformDecoderModule::Create*Decoder() to take an
mp4_demuxer::{Audio,Video}DecoderConfig parameter, instead of enumerating all
parameters. This means the platform decoders can have more data if need be,
like the AACAudioConfig.
Change MediaDataDecoder::Input() to take an nsAutoPtr<MP4Sample>&. The sample
will be deleted by the caller (MP4Reader) if Input() returns DECODE_STATUS_OK,
but if the MediaDataDecoder wants to assume responsibility of the
lifecycle of the sample (say to enqueue it), it can forget() on the
nsAutoPtr& passed in and assume responsibility.
Call PlatformDecoderModule::Create() on the decode thread. This is a step
towards making these classes decode-thread only.
Add PlatformDecoderModule::Init(), which caches the pref's we need, since
PlatformDecoderModule::Create() is no longer called on the main thread, we can
no longer access them in there.
Add Init() method to MediaDataDecoder interface. This is so that we can call
MediaDataDecoder::Shutdown() to unblock the initialization of a decoder, if
that init needs to block.
Pass LayersBackend type to WMFVideoDecoder, so it knows whether to init DXVA.
2014-01-15 16:13:54 +13:00
Wes Kocher
4feb8dd8e3
Merge b2g-inbound to m-c
2014-01-14 15:44:06 -08:00
Ryan VanderMeulen
18cde65ac6
Bug 865407 - Follow-up to fix other places expecting the old IID.
...
CLOSED TREE
2014-01-14 14:03:59 -05:00
Ryan VanderMeulen
9298dcfd06
Bug 865407 - Bump nsIWebVTTParserWrapper IID. CLOSED TREE
2014-01-14 13:52:48 -05:00
Ed Morley
f605c333d3
Bug 760770 - Disable test_timeupdate_small_files.html on Linux for intermittent failures
2014-01-14 16:38:25 +00:00
Alfredo Yang
471c9e9aa9
Bug 957939 - Move Audio_Track/Video_Track out of ISOTrackMetadata. r=cpearce
2014-01-14 09:59:40 -05:00
Paul Adenot
49abe4d300
Bug 955911 - r=roc
2014-01-13 17:38:30 +01:00
Edwin Flores
c637986ec6
Bug 945864 - Remove buggy MediaOmxReader::GetBuffered method override r=cpearce
2014-01-14 12:38:40 +13:00
Ryan VanderMeulen
5b8b6a8f8d
Merge inbound to m-c.
2014-01-13 17:44:24 -05:00
Rick Eyre
07cdd82baa
Bug 865407 - Part 7: Update vtt.js to latest version. r=rillan
...
We now call WebVTTParser.processCues() on the vtt.jsm module in order to get the computed divs of the cues.
2013-12-17 10:36:26 -05:00
Rick Eyre
4e420f1c25
Bug 865407 - Part 6: Expose VTTCue::Reset to Chrome JS. r=bz
2013-12-12 13:13:38 -05:00
Rick Eyre
78e1d23095
Bug 865407 - Part 5: Move update display of cues code to TextTrackManager. r=bz, r=rillian
2013-12-12 12:02:17 -05:00
Rick Eyre
4739efe22b
Bug 865407 - Part 4: Expose TextTrackCue::DisplayState to chrome JS. r=rillian, r=bz
2013-12-12 11:27:30 -05:00
Rick Eyre
bc2db591c5
Bug 865407 - Part 3: Add TextTrackList::GetAllActiveCues(). r=rillian
2013-12-12 10:57:21 -05:00
Alfredo Yang
0d8cda28c7
Bug 959022 - Add data-offset-present in traf box. r=cpearce
2014-01-13 08:28:26 -05:00
Wes Kocher
d8f87242ae
Backed out 2 changesets (bug 959440) on an unrelated CLOSED TREE
...
Backed out changeset f4fd03805620 (bug 959440)
Backed out changeset bfee2bc18e55 (bug 959440)
2014-01-14 17:37:57 -08:00