--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -925,17 +925,16 @@ VorbisState::ReconstructVorbisGranulepos
 
   return NS_OK;
 }
 
 OpusState::OpusState(ogg_page* aBosPage)
   : OggCodecState(aBosPage, true)
   , mParser(nullptr)
   , mDecoder(nullptr)
-  , mSkip(0)
   , mPrevPacketGranulepos(0)
   , mPrevPageGranulepos(0)
 {
   MOZ_COUNT_CTOR(OpusState);
 }
 
 OpusState::~OpusState()
 {
@@ -957,30 +956,28 @@ OpusState::Reset()
 nsresult
 OpusState::Reset(bool aStart)
 {
   nsresult res = NS_OK;
 
   if (mActive && mDecoder) {
     // Reset the decoder.
     opus_multistream_decoder_ctl(mDecoder, OPUS_RESET_STATE);
-    // Let the seek logic handle pre-roll if we're not seeking to the start.
-    mSkip = aStart ? mParser->mPreSkip : 0;
     // This lets us distinguish the first page being the last page vs. just
     // not having processed the previous page when we encounter the last page.
     mPrevPageGranulepos = aStart ? 0 : -1;
     mPrevPacketGranulepos = aStart ? 0 : -1;
   }
 
   // Clear queued data.
   if (NS_FAILED(OggCodecState::Reset())) {
     return NS_ERROR_FAILURE;
   }
 
-  LOG(LogLevel::Debug, ("Opus decoder reset, to skip %d", mSkip));
+  LOG(LogLevel::Debug, ("Opus decoder reset"));
 
   return res;
 }
 
 bool
 OpusState::Init(void)
 {
   if (!mActive) {
@@ -993,19 +990,17 @@ OpusState::Init(void)
 
   mDecoder = opus_multistream_decoder_create(mParser->mRate,
                                              mParser->mChannels,
                                              mParser->mStreams,
                                              mParser->mCoupledStreams,
                                              mParser->mMappingTable,
                                              &error);
 
-  mSkip = mParser->mPreSkip;
-
-  LOG(LogLevel::Debug, ("Opus decoder init, to skip %d", mSkip));
+  LOG(LogLevel::Debug, ("Opus decoder init"));
 
   return error == OPUS_OK;
 }
 
 bool
 OpusState::DecodeHeader(ogg_packet* aPacket)
 {
   nsAutoRef<ogg_packet> autoRelease(aPacket);
@@ -1014,21 +1009,16 @@ OpusState::DecodeHeader(ogg_packet* aPac
     case 0:
       mParser = new OpusParser;
       if (!mParser->DecodeHeader(aPacket->packet, aPacket->bytes)) {
         return false;
       }
       mRate = mParser->mRate;
       mChannels = mParser->mChannels;
       mPreSkip = mParser->mPreSkip;
-#ifdef MOZ_SAMPLE_TYPE_FLOAT32
-      mGain = mParser->mGain;
-#else
-      mGain_Q16 = mParser->mGain_Q16;
-#endif
       break;
 
     // Parse the metadata header.
     case 1:
       if (!mParser->DecodeTags(aPacket->packet, aPacket->bytes)) {
         return false;
       }
       break;

--- a/dom/media/ogg/OggCodecState.h
+++ b/dom/media/ogg/OggCodecState.h
@@ -400,26 +400,20 @@ public:
   already_AddRefed<MediaRawData> PacketOutAsMediaRawData() override;
   // Returns the end time that a granulepos represents.
   static int64_t Time(int aPreSkip, int64_t aGranulepos);
 
   // Various fields from the Ogg Opus header.
   int mRate;        // Sample rate the decoder uses (always 48 kHz).
   int mChannels;    // Number of channels the stream encodes.
   uint16_t mPreSkip; // Number of samples to strip after decoder reset.
-#ifdef MOZ_SAMPLE_TYPE_FLOAT32
-  float mGain;      // Gain to apply to decoder output.
-#else
-  int32_t mGain_Q16; // Gain to apply to the decoder output.
-#endif
 
   nsAutoPtr<OpusParser> mParser;
   OpusMSDecoder* mDecoder;
 
-  int mSkip;        // Number of samples left to trim before playback.
   // Granule position (end sample) of the last decoded Opus packet. This is
   // used to calculate the amount we should trim from the last packet.
   int64_t mPrevPacketGranulepos;
 
   // Construct and return a table of tags from the metadata header.
   MetadataTags* GetTags() override;
 
 private: