Bug 36624 – Configure multi-language movies

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Jer Noble]

Configure multi-language movies

[Jer Noble]

Created attachment 51694 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 51694 [details]
Patch

Looks non-harmful.  Marking cq+ since you're not a committer.

[Eric Seidel (no email)]

Comment on attachment 51694 [details]
Patch

Removing the cq+ since this might require a new WebCoreSystemInterface library drop.

[WebKit Commit Bot]

Comment on attachment 51694 [details]
Patch

Rejecting patch 51694 from commit-queue.

Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1
Last 500 characters of output:
/usr/bin/yacc
    /bin/sh -c /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebKit.build/Debug/WebKit.build/Script-5DE6D18C0FCF231B002DE28C.sh
** BUILD FAILED **

The following build commands failed:
WebKit:
	Distributed-CompileC /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebKit.build/Debug/WebKit.build/Objects-normal/i386/WebSystemInterface.o /Users/eseidel/Projects/CommitQueue/WebKit/mac/WebCoreSupport/WebSystemInterface.m normal i386 objective-c com.apple.compilers.gcc.4_2
(1 failure)


Full output: http://webkit-commit-queue.appspot.com/results/1326013

[Eric Seidel (no email)]

I need to teach the commit-queue how to re-check the commit-queue flag just before landing.  In this case the bot had already started on the patch before I removed the flag.  Sorry for the noise.

[Eric Carlson]

Comment on attachment 51694 [details]
Patch

> +++ WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm	(working copy)
> @@ -927,6 +927,7 @@ void MediaPlayerPrivate::updateStates()
>  
>      if (loadState >= QTMovieLoadStateLoaded && m_readyState < MediaPlayer::HaveMetadata) {
>          disableUnsupportedTracks();
> +        wkQTMovieSelectPreferredAlternates(m_qtMovie.get());
>          if (m_player->inMediaDocument()) {
>              if (!m_enabledTrackCount || m_hasUnsupportedTracks) {
>                  // This has a type of media that we do not handle directly with a <video> 

We don't know if the movie is playable at this point so you should call wkQTMovieSelectPreferredAlternates a few lines further down, after checking to see if the movie opened successfully (near the call to cacheMovieScale).


> Index: WebCore/platform/mac/WebCoreSystemInterface.h
> ===================================================================
> --- WebCore/platform/mac/WebCoreSystemInterface.h	(revision 56339)
> +++ WebCore/platform/mac/WebCoreSystemInterface.h	(working copy)
> @@ -129,6 +129,7 @@ extern float (*wkQTMovieMaxTimeSeekable)
>  extern int (*wkQTMovieGetType)(QTMovie* movie);
>  extern BOOL (*wkQTMovieHasClosedCaptions)(QTMovie* movie);
>  extern void (*wkQTMovieSetShowClosedCaptions)(QTMovie* movie, BOOL showClosedCaptions);
> +extern void (*wkQTMovieSelectPreferredAlternates)(QTMovie* movie);

The parameter name isn't needed here. You might as well get rid of the QTMovie parameter name on wkQTMovieGetType, wkQTMovieHasClosedCaptions, and wkQTMovieSetShowClosedCaptions while you are at it.


> Index: WebCore/platform/mac/WebCoreSystemInterface.mm
> ===================================================================
> --- WebCore/platform/mac/WebCoreSystemInterface.mm	(revision 56339)
> +++ WebCore/platform/mac/WebCoreSystemInterface.mm	(working copy)
> @@ -61,6 +61,7 @@ float (*wkQTMovieMaxTimeSeekable)(QTMovi
>  int (*wkQTMovieGetType)(QTMovie* movie);
>  BOOL (*wkQTMovieHasClosedCaptions)(QTMovie* movie);
>  void (*wkQTMovieSetShowClosedCaptions)(QTMovie* movie, BOOL showClosedCaptions);
> +void (*wkQTMovieSelectPreferredAlternates)(QTMovie* movie);

And here.

[Eric Carlson]

rdar://7717504

[Jer Noble]

Created attachment 51748 [details]
Patch

[Eric Carlson]

Comment on attachment 51748 [details]
Patch

Thanks!

[Jer Noble]

Created attachment 52104 [details]
Patch

[Jer Noble]

Created attachment 52105 [details]
New libWebKitSystemInterfaceLeopard.a

[Jer Noble]

Created attachment 52106 [details]
New libWebKitSystemInterfaceSnowLeopard.a

[Jer Noble]

Created attachment 52107 [details]
New libWebKitSystemInterfaceTiger.a

[Eric Seidel (no email)]

The commit queue will reject patches from contributers not listed as reviewers or committers in:
http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py
since I don't see your name there yet, I assume you didn't mean to mark these as r+/cq+?

I think the flags are mostly explained in:
http://webkit.org/coding/contributing.html
but I'm happy to answer questions about them if you have them. :)

[WebKit Commit Bot]

Comment on attachment 52104 [details]
Patch

Rejecting patch 52104 from review queue.

[e-mail] does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/committers.py.

- If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have reviewer rights please correct the error in WebKitTools/Scripts/webkitpy/committers.py by adding yourself to the file (no review needed).  Due to bug 30084 the commit-queue will require a restart after your change.  Please contact [e-mail] to request a commit-queue restart.  After restart the commit-queue will correctly respect your reviewer rights.

[Jer Noble]

Attempted to add the new libraries as part of the patch, but the resulting patch file was too large.  Attached the new libraries as binaries to this bug.

[Jer Noble]

Sorry, those patches/libraries should have been marked as review?.

[WebKit Review Bot]

Attachment 52105 [details] did not pass style-queue:

Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
Total errors found: 0 in 0 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Review Bot]

Attachment 52106 [details] did not pass style-queue:

Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
Total errors found: 0 in 0 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[WebKit Review Bot]

Attachment 52107 [details] did not pass style-queue:

Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
Total errors found: 0 in 0 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Eric Seidel (no email)]

Sorry, looks like check-webkit-style doesn't understand binary attachments.  I've filed bug 36872.

[Eric Seidel (no email)]

Comment on attachment 52105 [details]
New libWebKitSystemInterfaceLeopard.a

The commit-queue would barf if this were wrong, so it's safe to cq+ this blindly.

[Eric Seidel (no email)]

Comment on attachment 52105 [details]
New libWebKitSystemInterfaceLeopard.a

However, we should probably wait until the main change is r+'d before landing.

[Eric Carlson]

http://trac.webkit.org/changeset/57031