Changeset 26261

Timestamp:

07/05/08 14:22:37 (5 months ago)

Author:

stippi

Message:

* The window would not reset the audio/video track to 0 on a new file if

the Controller would keep the last audio/video track index across files
(which would be nice for certain situations).

* Better error message for unsupported files, especially for the

B_MEDIA_NO_HANDLER error.

* In the Controller, try to obtain the track duration and ignore tracks that

return a bogus duration. I have some MP3 files on ZETA that are obviously
not handled correctly by the ZETA mp3 decoder. Previously, the player would
just sit there and appeared to have some other internal error.

Location:

haiku/trunk/src/apps/mediaplayer

Files:

• Controller.cpp (modified) (8 diffs)
• Controller.h (modified) (1 diff)
• MainWin.cpp (modified) (4 diffs)
• supplier/AudioTrackSupplier.h (modified) (1 diff)
• supplier/MediaTrackAudioSupplier.cpp (modified) (4 diffs)
• supplier/MediaTrackAudioSupplier.h (modified) (3 diffs)
• supplier/MediaTrackVideoSupplier.cpp (modified) (2 diffs)
• supplier/MediaTrackVideoSupplier.h (modified) (3 diffs)
• supplier/VideoTrackSupplier.h (modified) (1 diff)

haiku/trunk/src/apps/mediaplayer/Controller.cpp

@@ -126 +126 @@
 Controller::Duration()
 {
+        // TODO: It is not so nice that the MediaPlayer still measures
+        // in video frames if only playing audio. Here for example, it will
+        // return a duration of 0 if the audio clip happens to be shorter than
+        // one video frame at 25 fps.
         return (int64)((double)fDuration * fVideoFrameRate / 1000000.0);
 }
@@ -196 +200 @@
         status_t err;
         
-        BMediaFile *mf = new BMediaFile(&ref);
+        BMediaFile* mf = new BMediaFile(&ref);
         ObjectDeleter<BMediaFile> mediaFileDeleter(mf);
 
@@ -214 +218 @@
         
         for (int i = 0; i < trackcount; i++) {
-                BMediaTrack *t = mf->TrackAt(i);
+                BMediaTrack* t = mf->TrackAt(i);
                 media_format f;
                 err = t->EncodedFormat(&f);
-                if (err != B_OK) {
+                if (err != B_OK || t->Duration() <= 0) {
                         printf("Controller::SetTo: EncodedFormat failed for track index %d, error 0x%08lx (%s)\n",
                                 i, err, strerror(err));
@@ -224 +228 @@
                 }
                 if (f.IsAudio()) {
-                        fAudioTrackList.AddItem(t);
+                        if (!fAudioTrackList.AddItem(t))
+                                return B_NO_MEMORY;
                 } else if (f.IsVideo()) {
-                        fVideoTrackList.AddItem(t);
+                        if (!fVideoTrackList.AddItem(t))
+                                return B_NO_MEMORY;
                 } else {
                         printf("Controller::SetTo: track index %d has unknown type\n", i);
@@ -327 +333 @@
 
         ObjectDeleter<AudioTrackSupplier> deleter(fAudioTrackSupplier);
-        fAudioTrackSupplier = new MediaTrackAudioSupplier(track);
+        fAudioTrackSupplier = new MediaTrackAudioSupplier(track, n);
 
         bigtime_t a = fAudioTrackSupplier->Duration();
@@ -335 +341 @@
         // TODO: notify duration changed!
 
-        // TODO: Not good, because the ProxyAudioSupplier currently
-        // uses the supplier without locking the Controller!
-        // This is only a problem when selecting a different audio track
-        // from the interface menu.
         fAudioSupplier->SetSupplier(fAudioTrackSupplier, fVideoFrameRate);
 
         _NotifyAudioTrackChanged(n);
         return B_OK;
+}
+
+
+int
+Controller::CurrentAudioTrack()
+{
+        BAutolock _(this);
+
+        if (fAudioTrackSupplier == NULL)
+                return -1;
+
+        return fAudioTrackSupplier->TrackIndex();
 }
 
@@ -357 +371 @@
         status_t initStatus;
         ObjectDeleter<VideoTrackSupplier> deleter(fVideoTrackSupplier);
-        fVideoTrackSupplier = new MediaTrackVideoSupplier(track, initStatus);
+        fVideoTrackSupplier = new MediaTrackVideoSupplier(track, n, initStatus);
         if (initStatus < B_OK) {
                 delete fVideoTrackSupplier;
@@ -381 +395 @@
         _NotifyVideoTrackChanged(n);
         return B_OK;
+}
+
+
+int
+Controller::CurrentVideoTrack()
+{
+        BAutolock _(this);
+
+        if (fVideoTrackSupplier == NULL)
+                return -1;
+
+        return fVideoTrackSupplier->TrackIndex();
 }
 

haiku/trunk/src/apps/mediaplayer/Controller.h

@@ -84 +84 @@
         
                         status_t                        SelectAudioTrack(int n);
+                        int                                     CurrentAudioTrack();
                         status_t                        SelectVideoTrack(int n);
+                        int                                     CurrentVideoTrack();
 
                         void                            Stop();

haiku/trunk/src/apps/mediaplayer/MainWin.cpp

@@ -710 +710 @@
                 if (fPlaylist->CountItems() == 1) {
                         // display error if this is the only file we're supposed to play
-                        char s[300];
-                        sprintf(s, "Can't open file\n\n%s\n\nError 0x%08lx\n(%s)\n",
-                                ref.name, err, strerror(err));
-                        (new BAlert("error", s, "OK"))->Go();
+                        BString message;
+                        message << "The file '";
+                        message << ref.name;
+                        message << "' could not be opened.\n\n";
+                        
+                        if (err == B_MEDIA_NO_HANDLER) {
+                                // give a more detailed message for the most likely of all
+                                // errors
+                                message << "There is no decoder installed to handle the "
+                                        "file format, or the decoder has trouble with the specific "
+                                        "version of the format.";
+                        } else {
+                                message << "Error: " << strerror(err);
+                        }
+                        (new BAlert("error", message.String(), "OK"))->Go();
                 } else {
                         // just go to the next file and don't bother user
@@ -829 +840 @@
         fAudioTrackMenu->SetEnabled(fHasFile);
         fVideoTrackMenu->SetEnabled(fHasFile);
-        // Select first track (might be "none") in both
-        fAudioTrackMenu->ItemAt(0)->SetMarked(true);
-        fVideoTrackMenu->ItemAt(0)->SetMarked(true);
 
         fVideoMenu->SetEnabled(fHasVideo);
@@ -848 +856 @@
         _UpdateControlsEnabledStatus();
 
+        // TODO: Don't if the video size did not change! Also don't
+        // exit full screen mode.
         _ResizeWindow(100);
 
@@ -959 +969 @@
         fVideoTrackMenu->RemoveItems(0, fVideoTrackMenu->CountItems(), true);
         
-        int c, i;
         char s[100];
         
-        c = fController->AudioTrackCount();
-        for (i = 0; i < c; i++) {
+        int count = fController->AudioTrackCount();
+        int current = fController->CurrentAudioTrack();
+        for (int i = 0; i < count; i++) {
                 sprintf(s, "Track %d", i + 1);
-                fAudioTrackMenu->AddItem(new BMenuItem(s,
-                        new BMessage(M_SELECT_AUDIO_TRACK + i)));
-        }
-        if (!c)
+                BMenuItem* item = new BMenuItem(s,
+                        new BMessage(M_SELECT_AUDIO_TRACK + i));
+                item->SetMarked(i == current);
+                fAudioTrackMenu->AddItem(item);
+        }
+        if (!count) {
                 fAudioTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY)));
-
-        c = fController->VideoTrackCount();
-        for (i = 0; i < c; i++) {
+                fAudioTrackMenu->ItemAt(0)->SetMarked(true);
+        }
+
+
+        count = fController->VideoTrackCount();
+        current = fController->CurrentVideoTrack();
+        for (int i = 0; i < count; i++) {
                 sprintf(s, "Track %d", i + 1);
-                fVideoTrackMenu->AddItem(new BMenuItem(s,
-                        new BMessage(M_SELECT_VIDEO_TRACK + i)));
-        }
-        if (!c)
+                BMenuItem* item = new BMenuItem(s,
+                        new BMessage(M_SELECT_VIDEO_TRACK + i));
+                item->SetMarked(i == current);
+                fVideoTrackMenu->AddItem(item);
+        }
+        if (!count) {
                 fVideoTrackMenu->AddItem(new BMenuItem("none", new BMessage(M_DUMMY)));
+                fVideoTrackMenu->ItemAt(0)->SetMarked(true);
+        }
 }
 

haiku/trunk/src/apps/mediaplayer/supplier/AudioTrackSupplier.h

@@ -24 +24 @@
         virtual status_t                        GetCodecInfo(media_codec_info* info) const = 0;
         virtual bigtime_t                       Duration() const = 0;
+
+        virtual int32                           TrackIndex() const = 0;
 };
 

haiku/trunk/src/apps/mediaplayer/supplier/MediaTrackAudioSupplier.cpp

@@ -55 +55 @@
 
 
-MediaTrackAudioSupplier::MediaTrackAudioSupplier(BMediaTrack* mediaTrack)
+MediaTrackAudioSupplier::MediaTrackAudioSupplier(BMediaTrack* mediaTrack,
+                int32 trackIndex)
         : AudioTrackSupplier(),
           fMediaTrack(mediaTrack),
@@ -64 +65 @@
           fHasKeyFrames(false),
           fCountFrames(0),
-          fReportSeekError(true)
+          fReportSeekError(true),
+          fTrackIndex(trackIndex)
 {
         _InitFromTrack();
@@ -105 +107 @@
 MediaTrackAudioSupplier::Duration() const
 {
+        fMediaTrack, fMediaTrack ? fMediaTrack->Duration() : 0LL, fCountFrames);
         if (!fMediaTrack)
                 return 0;
@@ -200 +203 @@
                 // get the length of the track
                 fCountFrames = fMediaTrack->CountFrames();
+
+                TRACE("MediaTrackAudioSupplier: keyframes: %d, frame count: %lld\n",
+                        fHasKeyFrames, fCountFrames);
         } else
                 fMediaTrack = NULL;

haiku/trunk/src/apps/mediaplayer/supplier/MediaTrackAudioSupplier.h

@@ -17 +17 @@
 class MediaTrackAudioSupplier : public AudioTrackSupplier {
  public:
-                                                                MediaTrackAudioSupplier(BMediaTrack* track);
+                                                                MediaTrackAudioSupplier(BMediaTrack* track,
+                                                                        int32 trackIndex);
         virtual                                         ~MediaTrackAudioSupplier();
 
@@ -30 +31 @@
 
         virtual status_t                        InitCheck() const;
+
+        virtual int32                           TrackIndex() const
+                                                                        { return fTrackIndex; }
 
  private:
@@ -85 +89 @@
                         int64                           fCountFrames;
                         bool                            fReportSeekError;
+                        int32                           fTrackIndex;
 };
 

haiku/trunk/src/apps/mediaplayer/supplier/MediaTrackVideoSupplier.cpp

@@ -25 +25 @@
 // constructor
 MediaTrackVideoSupplier::MediaTrackVideoSupplier(BMediaTrack* track,
-                status_t& initStatus)
+                int32 trackIndex, status_t& initStatus)
         : VideoTrackSupplier()
         , fVideoTrack(track)
@@ -32 +32 @@
         , fDuration(0)
         , fCurrentFrame(0)
+
+        , fTrackIndex(trackIndex)
 {
         if (!fVideoTrack) {

haiku/trunk/src/apps/mediaplayer/supplier/MediaTrackVideoSupplier.h

@@ -18 +18 @@
  public:
                                                                 MediaTrackVideoSupplier(BMediaTrack* track,
-                                                                        status_t& initStatus);
+                                                                        int32 trackIndex, status_t& initStatus);
         virtual                                         ~MediaTrackVideoSupplier();
 
@@ -43 +43 @@
         virtual uint32                          BytesPerRow() const;
 
+        virtual int32                           TrackIndex() const
+                                                                        { return fTrackIndex; }
+
  private:
                         status_t                        _SwitchFormat(color_space format,
@@ -56 +59 @@
                         bigtime_t                       fDuration;
                         int64                           fCurrentFrame;
+
+                        int32                           fTrackIndex;
 };
 

haiku/trunk/src/apps/mediaplayer/supplier/VideoTrackSupplier.h

@@ -32 +32 @@
         virtual bigtime_t                       Duration() const = 0;
         virtual int64                           CurrentFrame() const = 0;
+
+        virtual int32                           TrackIndex() const = 0;
 };