Skip to content

Commit 57b89e7

Browse files
committed
[tvOS] Adapt to removal of Starboard headers post-C25
* starboard/memory.h was removed in #4126 * starboard/string.h was removed in #4106 * starboard/directory.h was removed in #4106 * starboard/common/optional.h was removed in #5986 Bug: 456692793
1 parent 26634b0 commit 57b89e7

11 files changed

+5
-13
lines changed

starboard/tvos/shared/input_events.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include "starboard/common/time.h"
2020
#include "starboard/input.h"
21-
#include "starboard/memory.h"
2221
#include "starboard/tvos/shared/application_darwin.h"
2322
#import "starboard/tvos/shared/defines.h"
2423

starboard/tvos/shared/media/application_player.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "starboard/common/log.h"
2222
#include "starboard/media.h"
23-
#include "starboard/memory.h"
2423
#import "starboard/tvos/shared/defines.h"
2524
#import "starboard/tvos/shared/media/application_drm_system.h"
2625
#import "starboard/tvos/shared/media/player_manager.h"

starboard/tvos/shared/media/audio_queue_audio_sink_type.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "starboard/common/log.h"
2525
#include "starboard/common/mutex.h"
2626
#include "starboard/common/time.h"
27-
#include "starboard/memory.h"
2827
#include "starboard/shared/internal_only.h"
2928
#include "starboard/shared/pthread/thread_create_priority.h"
3029
#include "starboard/shared/starboard/audio_sink/audio_sink_internal.h"

starboard/tvos/shared/media/av_audio_sample_buffer_builder.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616

1717
#include <vector>
1818

19-
#include "starboard/memory.h"
2019
#include "starboard/shared/starboard/player/decoded_audio_internal.h"
21-
#include "starboard/string.h"
2220
#include "third_party/opus/src/include/opus.h"
2321
#include "third_party/opus/src/include/opus_multistream.h"
2422

starboard/tvos/shared/media/avc_av_video_sample_buffer_builder.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
#ifndef STARBOARD_TVOS_SHARED_MEDIA_AVC_AV_VIDEO_SAMPLE_BUFFER_BUILDER_H_
1616
#define STARBOARD_TVOS_SHARED_MEDIA_AVC_AV_VIDEO_SAMPLE_BUFFER_BUILDER_H_
1717

18-
#include "starboard/common/optional.h"
18+
#include <optional>
19+
1920
#include "starboard/shared/starboard/media/codec_util.h"
2021
#import "starboard/tvos/shared/media/av_video_sample_buffer_builder.h"
2122

@@ -40,7 +41,7 @@ class AvcAVVideoSampleBufferBuilder : public AVVideoSampleBufferBuilder {
4041
bool RefreshAVCFormatDescription(
4142
const starboard::media::AvcParameterSets& parameter_sets);
4243

43-
optional<starboard::media::VideoConfig> video_config_;
44+
std::optional<VideoConfig> video_config_;
4445
uint64_t frame_counter_ = 0;
4546
CMFormatDescriptionRef format_description_ = nullptr;
4647
};

starboard/tvos/shared/media/avc_av_video_sample_buffer_builder.mm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
SB_DCHECK(thread_checker_.CalledOnValidThread());
4343
AVVideoSampleBufferBuilder::Reset();
4444
video_config_ = nullopt;
45+
video_config_ = std::nullopt;
4546
if (format_description_) {
4647
CFRelease(format_description_);
4748
format_description_ = nullptr;

starboard/tvos/shared/media/playback_capabilities.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "starboard/common/log.h"
2424
#include "starboard/common/mutex.h"
2525
#include "starboard/common/once.h"
26-
#include "starboard/string.h"
2726
#include "starboard/system.h"
2827
#include "starboard/tvos/shared/observer_registry.h"
2928
#include "starboard/tvos/shared/uikit_media_session_client.h"

starboard/tvos/shared/media/video_decoder.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <vector>
2424

2525
#include "starboard/common/atomic.h"
26-
#include "starboard/common/optional.h"
2726
#include "starboard/common/ref_counted.h"
2827
#include "starboard/shared/starboard/media/avc_util.h"
2928
#include "starboard/shared/starboard/media/codec_util.h"
@@ -110,7 +109,7 @@ class TvosVideoDecoder
110109
bool stream_ended_ = false;
111110
bool error_occurred_ = false;
112111
atomic_int32_t decoding_frames_;
113-
optional<starboard::media::VideoConfig> video_config_;
112+
std::optional<VideoConfig> video_config_;
114113
uint64_t frame_counter_ = 0;
115114
scoped_refptr<VideoFrame> last_frame_;
116115
scoped_refptr<DecodedImage> last_decoded_image_;

starboard/tvos/shared/media/video_decoder.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <functional>
2121
#include <vector>
2222

23-
#include "starboard/memory.h"
2423
#include "starboard/shared/starboard/decode_target/decode_target_context_runner.h"
2524
#include "starboard/shared/starboard/media/media_util.h"
2625
#include "starboard/tvos/shared/media/decode_target_internal.h"

starboard/tvos/shared/system_get_path.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "starboard/common/log.h"
1818
#include "starboard/common/string.h"
19-
#include "starboard/directory.h"
2019

2120
bool SbSystemGetPath(SbSystemPathId path_id, char* out_path, int path_size) {
2221
if (!out_path || path_size <= 0) {

0 commit comments

Comments
 (0)