Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mullvad Browser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
Mullvad Browser
Commits
787b689f
Commit
787b689f
authored
9 years ago
by
Chris Pearce
Browse files
Options
Downloads
Patches
Plain Diff
Bug 1207376 - Check whether H264Converter created its decoder successfully. r=jya
parent
a3bf2b48
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dom/media/platforms/PlatformDecoderModule.cpp
+9
-1
9 additions, 1 deletion
dom/media/platforms/PlatformDecoderModule.cpp
dom/media/platforms/wrappers/H264Converter.h
+1
-0
1 addition, 0 deletions
dom/media/platforms/wrappers/H264Converter.h
with
10 additions
and
1 deletion
dom/media/platforms/PlatformDecoderModule.cpp
+
9
−
1
View file @
787b689f
...
...
@@ -242,12 +242,20 @@ PlatformDecoderModule::CreateDecoder(const TrackInfo& aConfig,
}
if
(
H264Converter
::
IsH264
(
aConfig
))
{
m
=
new
H264Converter
(
this
,
nsRefPtr
<
H264Converter
>
h
=
new
H264Converter
(
this
,
*
aConfig
.
GetAsVideoInfo
(),
aLayersBackend
,
aImageContainer
,
aTaskQueue
,
callback
);
const
nsresult
rv
=
h
->
GetLastError
();
if
(
NS_SUCCEEDED
(
rv
)
||
rv
==
NS_ERROR_NOT_INITIALIZED
)
{
// The H264Converter either successfully created the wrapped decoder,
// or there wasn't enough AVCC data to do so. Otherwise, there was some
// problem, for example WMF DLLs were missing.
m
=
h
.
forget
();
}
}
else
if
(
!
hasPlatformDecoder
&&
VPXDecoder
::
IsVPX
(
aConfig
.
mMimeType
))
{
m
=
new
VPXDecoder
(
*
aConfig
.
GetAsVideoInfo
(),
aImageContainer
,
...
...
This diff is collapsed.
Click to expand it.
dom/media/platforms/wrappers/H264Converter.h
+
1
−
0
View file @
787b689f
...
...
@@ -38,6 +38,7 @@ public:
// Return true if mimetype is H.264.
static
bool
IsH264
(
const
TrackInfo
&
aConfig
);
nsresult
GetLastError
()
const
{
return
mLastError
;
}
private
:
// Will create the required MediaDataDecoder if need AVCC and we have a SPS NAL.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment