Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick PR #3988: [android] Move files in dev/cobalt/media to .../coat #4003

Merged
merged 2 commits into from
Aug 17, 2024
Merged

Cherry pick PR #3988: [android] Move files in dev/cobalt/media to .../coat #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d8f260
[android] Move files in dev/cobalt/media to .../coat (#3988)
xiaomings Aug 15, 2024
748ab9c
Update apk_sources.gni
xiaomings Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions starboard/android/apk/apk_sources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
apk_sources = [
"//starboard/android/apk/app/src/app/java/dev/cobalt/app/CobaltApplication.java",
"//starboard/android/apk/app/src/app/java/dev/cobalt/app/MainActivity.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/ArtworkDownloader.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/ArtworkDownloaderDefault.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/ArtworkLoader.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/AudioPermissionRequester.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CaptionSettings.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltA11yHelper.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltActivity.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltHttpHelper.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltMediaSession.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltService.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltSystemConfigChangeReceiver.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltTextToSpeechHelper.java",
Expand All @@ -30,26 +35,21 @@ apk_sources = [
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/KeyboardEditor.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/KeyboardInputConnection.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/MediaPlaybackService.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/MediaImage.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/NetworkStatus.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/NullCobaltFactory.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/PlatformError.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/ResourceOverlay.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/libraries/services/clientloginfo/ClientLogInfo.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/libraries/services/clientloginfo/ClientLogInfoModule.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/ArtworkDownloader.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/ArtworkDownloaderDefault.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/ArtworkLoader.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/AudioOutputManager.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/AudioTrackBridge.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/CaptionSettings.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/CobaltMediaSession.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/Log.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecBridge.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecCapabilitiesLogger.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaCodecUtil.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaDrmBridge.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/MediaImage.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/VideoFrameReleaseTimeHelper.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/VideoSurfaceTexture.java",
"//starboard/android/apk/app/src/main/java/dev/cobalt/media/VideoSurfaceView.java",
Expand Down
2 changes: 1 addition & 1 deletion starboard/android/apk/app/src/app/java/dev/cobalt/app/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

import android.app.Activity;
import android.app.Service;
import dev.cobalt.coat.ArtworkDownloaderDefault;
import dev.cobalt.coat.CobaltActivity;
import dev.cobalt.coat.CobaltService;
import dev.cobalt.coat.StarboardBridge;
import dev.cobalt.libraries.services.clientloginfo.ClientLogInfoModule;
import dev.cobalt.media.ArtworkDownloaderDefault;
import dev.cobalt.util.Holder;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...a/dev/cobalt/media/ArtworkDownloader.java → ...va/dev/cobalt/coat/ArtworkDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cobalt.media;
package dev.cobalt.coat;

/**
* Interface to download artwork (Bitmap) from a URL, intended for use in media session metadata.
Expand Down
4 changes: 2 additions & 2 deletions ...obalt/media/ArtworkDownloaderDefault.java → ...cobalt/coat/ArtworkDownloaderDefault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cobalt.media;
package dev.cobalt.coat;

import static dev.cobalt.media.Log.TAG;
import static dev.cobalt.util.Log.TAG;

import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
Expand Down
2 changes: 1 addition & 1 deletion .../java/dev/cobalt/media/ArtworkLoader.java → ...n/java/dev/cobalt/coat/ArtworkLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cobalt.media;
package dev.cobalt.coat;

import android.graphics.Bitmap;
import android.os.Handler;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/dev/cobalt/media/CaptionSettings.java → ...java/dev/cobalt/coat/CaptionSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cobalt.media;
package dev.cobalt.coat;

import android.view.accessibility.CaptioningManager;
import dev.cobalt.util.UsedByNative;
Expand Down
6 changes: 3 additions & 3 deletions .../dev/cobalt/media/CobaltMediaSession.java → ...a/dev/cobalt/coat/CobaltMediaSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cobalt.media;
package dev.cobalt.coat;

import static dev.cobalt.media.Log.TAG;
import static dev.cobalt.util.Log.TAG;

import android.app.Activity;
import android.content.Context;
Expand Down Expand Up @@ -50,7 +50,7 @@ public class CobaltMediaSession

private AudioFocusRequest audioFocusRequest;

interface UpdateVolumeListener {
public interface UpdateVolumeListener {
/** Called when there is a change in audio focus. */
void onUpdateVolume(float gain);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/dev/cobalt/media/MediaImage.java → ...main/java/dev/cobalt/coat/MediaImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package dev.cobalt.media;
package dev.cobalt.coat;

import dev.cobalt.util.UsedByNative;

Expand Down
4 changes: 0 additions & 4 deletions starboard/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.CaptioningManager;
import androidx.annotation.Nullable;
import dev.cobalt.media.ArtworkDownloader;
import dev.cobalt.media.AudioOutputManager;
import dev.cobalt.media.CaptionSettings;
import dev.cobalt.media.CobaltMediaSession;
import dev.cobalt.media.MediaImage;
import dev.cobalt.util.DisplayUtil;
import dev.cobalt.util.Holder;
import dev.cobalt.util.Log;
Expand Down
1 change: 1 addition & 0 deletions starboard/android/apk/app/src/main/java/dev/cobalt/media/AudioOutputManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import android.media.AudioTrack;
import android.os.Build;
import androidx.annotation.RequiresApi;
import dev.cobalt.coat.CobaltMediaSession;
import dev.cobalt.util.Log;
import dev.cobalt.util.UsedByNative;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion starboard/android/shared/accessibility_get_caption_settings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ bool SbAccessibilityGetCaptionSettings(

ScopedLocalJavaRef<jobject> j_caption_settings(
env->CallStarboardObjectMethodOrAbort(
"getCaptionSettings", "()Ldev/cobalt/media/CaptionSettings;"));
"getCaptionSettings", "()Ldev/cobalt/coat/CaptionSettings;"));

jfloat font_scale =
env->GetFloatFieldOrAbort(j_caption_settings.Get(), "fontScale", "F");
Expand Down
12 changes: 6 additions & 6 deletions starboard/android/shared/android_media_session_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ void OnMediaSessionStateChanged(
if (artwork_count > 0) {
CobaltExtensionMediaImage* artwork(media_metadata->artwork);
ScopedLocalJavaRef<jclass> media_image_class(
env->FindClassExtOrAbort("dev/cobalt/media/MediaImage"));
env->FindClassExtOrAbort("dev/cobalt/coat/MediaImage"));
jmethodID media_image_constructor = env->GetMethodID(
media_image_class.Get(), "<init>",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
Expand Down Expand Up @@ -234,7 +234,7 @@ void OnMediaSessionStateChanged(
env->CallStarboardVoidMethodOrAbort(
"updateMediaSession",
"(IJJFLjava/lang/String;Ljava/lang/String;Ljava/lang/String;"
"[Ldev/cobalt/media/MediaImage;J)V",
"[Ldev/cobalt/coat/MediaImage;J)V",
playback_state, playback_state_actions,
session_state.current_playback_position / kSbTimeMillisecond,
static_cast<jfloat>(session_state.actual_playback_rate), j_title.Get(),
Expand Down Expand Up @@ -290,9 +290,9 @@ const void* GetMediaSessionApi() {
} // namespace starboard

extern "C" SB_EXPORT_PLATFORM void
Java_dev_cobalt_media_CobaltMediaSession_nativeInvokeAction(JNIEnv* env,
jclass unused_clazz,
jlong action,
jlong seek_ms) {
Java_dev_cobalt_coat_CobaltMediaSession_nativeInvokeAction(JNIEnv* env,
jclass unused_clazz,
jlong action,
jlong seek_ms) {
starboard::android::shared::NativeInvokeAction(action, seek_ms);
}
Loading